Skip to content

Commit d835160

Browse files
authored
get rid of Ubuntu 20.04 (#399)
1 parent d5f7781 commit d835160

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
matrix:
1515
python-version: [
1616
"2.7",
17-
"3.5",
1817
"3.6",
1918
"3.7",
2019
"3.8",
@@ -34,14 +33,10 @@ jobs:
3433
os: "windows-latest"
3534
- python-version: "2.7"
3635
os: "macos-latest"
37-
- python-version: "3.5"
38-
os: "macos-latest"
3936
- python-version: "3.6"
4037
os: "macos-latest"
4138
- python-version: "3.7"
4239
os: "macos-latest"
43-
- python-version: "3.5"
44-
os: "ubuntu-latest"
4540
- python-version: "3.6"
4641
os: "ubuntu-latest"
4742
- python-version: "3.7"
@@ -54,25 +49,22 @@ jobs:
5449
- python-version: "3.7"
5550
os: "macos-13"
5651
- python-version: "2.7"
57-
os: "ubuntu-20.04"
58-
- python-version: "3.5"
59-
os: "ubuntu-20.04"
52+
os: "ubuntu-22.04"
53+
use-container: true
6054
- python-version: "3.6"
61-
os: "ubuntu-20.04"
55+
os: "ubuntu-22.04"
56+
use-container: true
6257
- python-version: "3.7"
6358
os: "ubuntu-22.04"
59+
use-container: true
6460
runs-on: ${{ matrix.os }}
61+
container:
62+
image: ${{ matrix.use-container && format('python:{0}', matrix.python-version) || '' }}
6563
env:
6664
TOXENV: py
6765
steps:
6866
- uses: actions/checkout@v5
69-
- if: ${{ matrix.python-version == '2.7' }}
70-
run: |
71-
sudo apt-get install python-is-python2
72-
curl -sSL https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py
73-
python get-pip.py
74-
name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
75-
- if: ${{ matrix.python-version != '2.7' }}
67+
- if: ${{ !matrix.use-container }}
7668
name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
7769
uses: actions/setup-python@v6
7870
with:

0 commit comments

Comments
 (0)