Skip to content

Commit 7885137

Browse files
committed
Fix CI
1 parent b36da70 commit 7885137

1 file changed

Lines changed: 15 additions & 25 deletions

File tree

.github/workflows/tests.yml

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
os: [ubuntu-20.04, ubuntu-22.04]
18+
os: [ubuntu-22.04, ubuntu-24.04]
1919
steps:
2020
- uses: actions/checkout@v3
2121
- name: Install System Python
@@ -82,20 +82,6 @@ jobs:
8282
token: ${{ secrets.CODECOV_TOKEN }}
8383
verbose: true
8484

85-
rhel7:
86-
name: rhel7-system-python
87-
runs-on: ubuntu-latest
88-
container: "centos:7"
89-
steps:
90-
- name: Install System Python and Git
91-
run: yum install -y python3-devel python3-pip python3 git
92-
- uses: actions/checkout@v3
93-
- name: Install Testing Requirements
94-
run: python3 -m pip install nox
95-
- name: Run Tests
96-
run: python3 -m nox -e tests
97-
# we don't upload coverage here because codecov's uploader doesn't support OS's this old
98-
9985
rhel8-system-python:
10086
name: rhel8-system-python
10187
runs-on: ubuntu-latest
@@ -188,10 +174,9 @@ jobs:
188174
msystem: MINGW64
189175
install: >-
190176
mingw-w64-x86_64-toolchain
177+
mingw-w64-x86_64-gnupg
191178
mingw-w64-x86_64-python
192179
mingw-w64-x86_64-python-pip
193-
mingw-w64-x86_64-python-setuptools
194-
mingw-w64-x86_64-python-wheel
195180
update: true
196181
- name: Install msys2 (MSYS)
197182
if: matrix.msystem == 'MSYS'
@@ -200,18 +185,18 @@ jobs:
200185
msystem: MSYS
201186
install: >-
202187
msys2-devel
203-
git
188+
gnupg
204189
python
205-
python-devel
206190
python-pip
207-
python-setuptools
208191
update: true
209-
- name: Install wheel package (MSYS)
210-
if: matrix.msystem == 'MSYS'
211-
run: pip install --no-build-isolation wheel
212192
- uses: actions/checkout@v3
193+
- name: Build venv
194+
run: |
195+
python -m venv .venv
196+
. .venv/bin/activate
197+
echo PATH=$PATH >> $GITHUB_ENV
213198
- name: Install package
214-
run: pip install --no-build-isolation .
199+
run: pip install .
215200
- name: Print libpython
216201
run: |
217202
echo 'NAMES'
@@ -221,7 +206,7 @@ jobs:
221206
echo 'LOCATION'
222207
find_libpython -v
223208
- name: Install Testing Requirements
224-
run: pip install --no-build-isolation pytest pytest-cov
209+
run: pip install pytest pytest-cov coverage
225210
- name: Run Tests
226211
run: |
227212
pytest --cov --cov-branch tests/
@@ -265,6 +250,11 @@ jobs:
265250
brew install python git
266251
- name: Download Source
267252
uses: actions/checkout@v3
253+
- name: Build venv
254+
run: |
255+
python3 -m venv .venv
256+
. .venv/bin/activate
257+
echo PATH=$PATH >> $GITHUB_ENV
268258
- name: Install Testing Requirements
269259
run: |
270260
python3 -m pip install nox

0 commit comments

Comments
 (0)