Skip to content

Commit c12ef2e

Browse files
authored
Fix CI by downgrading OS image (#1160)
- Downgrade from ubuntu-latest (recently updated from 22.04 to 24.04) back to ubuntu-22.04 - Explicitly add PyQT6-sip dependency to py-epidata, as versions after 13.8 require a newer python version (3.9)
1 parent f9b7610 commit c12ef2e

File tree

3 files changed

+29
-27
lines changed

3 files changed

+29
-27
lines changed

.github/workflows/epidata_main.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020

2121
jobs:
2222
pre-commit:
23-
runs-on: ubuntu-latest
23+
runs-on: ubuntu-22.04
2424
steps:
2525
- uses: actions/checkout@v4
2626
- uses: actions/setup-python@v5
@@ -29,7 +29,7 @@ jobs:
2929
- uses: pre-commit/action@v3.0.1
3030

3131
build-py-epidata:
32-
runs-on: ubuntu-latest
32+
runs-on: ubuntu-22.04
3333
container: quay.io/pypa/manylinux_2_28_x86_64
3434
steps:
3535
- uses: actions/checkout@v4
@@ -39,7 +39,7 @@ jobs:
3939

4040
build-py-plot:
4141
if: github.event.pull_request.draft == false
42-
runs-on: ubuntu-latest
42+
runs-on: ubuntu-22.04
4343
container: quay.io/pypa/manylinux_2_28_x86_64
4444
steps:
4545
- uses: actions/checkout@v4
@@ -52,7 +52,7 @@ jobs:
5252
strategy:
5353
matrix:
5454
version: ["3.8", "3.11"]
55-
runs-on: ubuntu-latest
55+
runs-on: ubuntu-22.04
5656
steps:
5757
- uses: actions/checkout@v4
5858
- uses: ./.github/actions/test-py
@@ -67,7 +67,7 @@ jobs:
6767
strategy:
6868
matrix:
6969
version: ["3.8", "3.11"]
70-
runs-on: ubuntu-latest
70+
runs-on: ubuntu-22.04
7171
steps:
7272
- uses: actions/checkout@v4
7373
- uses: ./.github/actions/test-py
@@ -77,7 +77,7 @@ jobs:
7777
coverage: ON
7878

7979
merge-artifacts:
80-
runs-on: ubuntu-latest
80+
runs-on: ubuntu-22.04
8181
strategy:
8282
matrix:
8383
packages: [epidata, plot]
@@ -91,7 +91,7 @@ jobs:
9191

9292
test-pylint-epidata:
9393
needs: build-py-epidata
94-
runs-on: ubuntu-latest
94+
runs-on: ubuntu-22.04
9595
steps:
9696
- uses: actions/checkout@v4
9797
- uses: ./.github/actions/test-pylint
@@ -100,7 +100,7 @@ jobs:
100100

101101
test-pylint-plot:
102102
needs: build-py-plot
103-
runs-on: ubuntu-latest
103+
runs-on: ubuntu-22.04
104104
steps:
105105
- uses: actions/checkout@v4
106106
- uses: ./.github/actions/test-pylint
@@ -109,7 +109,7 @@ jobs:
109109

110110
download-data:
111111
needs: build-py-epidata
112-
runs-on: ubuntu-latest
112+
runs-on: ubuntu-22.04
113113
continue-on-error: true
114114
steps:
115115
- uses: actions/checkout@v4

.github/workflows/main.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919

2020
jobs:
2121
pre-commit:
22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-22.04
2323
steps:
2424
- uses: actions/checkout@v4
2525
- uses: actions/setup-python@v5
@@ -36,7 +36,7 @@ jobs:
3636
version: ["latest", "min"]
3737
include:
3838
- version: "latest"
39-
os: "ubuntu-latest"
39+
os: "ubuntu-22.04"
4040
- version: "min"
4141
os: "ubuntu-20.04"
4242
runs-on: ${{ matrix.os }}
@@ -52,7 +52,7 @@ jobs:
5252

5353
build-cpp-gcc-no-optional-deps:
5454
if: github.event.pull_request.draft == false
55-
runs-on: ubuntu-latest
55+
runs-on: ubuntu-22.04
5656
steps:
5757
- uses: actions/checkout@v4
5858
- uses: ./.github/actions/linux-build
@@ -64,7 +64,7 @@ jobs:
6464

6565
build-cpp-gcc-openmp:
6666
if: github.event.pull_request.draft == false
67-
runs-on: ubuntu-latest
67+
runs-on: ubuntu-22.04
6868
steps:
6969
- uses: actions/checkout@v4
7070
- uses: ./.github/actions/linux-build
@@ -114,7 +114,7 @@ jobs:
114114
version: ["latest", "min"]
115115
include:
116116
- version: "latest"
117-
os: "ubuntu-latest"
117+
os: "ubuntu-22.04"
118118
- version: "min"
119119
os: "ubuntu-20.04"
120120
runs-on: ${{ matrix.os }}
@@ -127,7 +127,7 @@ jobs:
127127

128128
merge-test-artifacts:
129129
needs: [test-cpp-gcc_clang, test-cpp-msvc, test-py-surrogatemodel]
130-
runs-on: ubuntu-latest
130+
runs-on: ubuntu-22.04
131131
steps:
132132
- name: merge-coverage-artifacts
133133
uses: actions/upload-artifact/merge@v4
@@ -153,7 +153,7 @@ jobs:
153153
test-cpp-gcc-no-optional-deps:
154154
if: github.event.pull_request.draft == false
155155
needs: build-cpp-gcc-no-optional-deps
156-
runs-on: ubuntu-latest
156+
runs-on: ubuntu-22.04
157157
steps:
158158
- uses: actions/checkout@v4
159159
- uses: ./.github/actions/linux-test
@@ -164,7 +164,7 @@ jobs:
164164
test-cpp-gcc-openmp:
165165
if: github.event.pull_request.draft == false
166166
needs: build-cpp-gcc-openmp
167-
runs-on: ubuntu-latest
167+
runs-on: ubuntu-22.04
168168
timeout-minutes: 30
169169
env:
170170
OMP_NUM_THREADS: 4
@@ -216,7 +216,7 @@ jobs:
216216
version: ["latest", "min"]
217217
include:
218218
- version: "latest"
219-
os: "ubuntu-latest"
219+
os: "ubuntu-22.04"
220220
- version: "min"
221221
os: "ubuntu-20.04"
222222
runs-on: ${{ matrix.os }}
@@ -247,7 +247,7 @@ jobs:
247247

248248
build-py-generation:
249249
if: github.event.pull_request.draft == false
250-
runs-on: ubuntu-latest
250+
runs-on: ubuntu-22.04
251251
container: quay.io/pypa/manylinux_2_28_x86_64
252252
steps:
253253
- uses: actions/checkout@v4
@@ -257,7 +257,7 @@ jobs:
257257

258258
build-py-simulation:
259259
if: github.event.pull_request.draft == false
260-
runs-on: ubuntu-latest
260+
runs-on: ubuntu-22.04
261261
container: quay.io/pypa/manylinux_2_28_x86_64
262262
steps:
263263
- uses: actions/checkout@v4
@@ -267,7 +267,7 @@ jobs:
267267

268268
build-py-surrogatemodel:
269269
if: github.event.pull_request.draft == false
270-
runs-on: ubuntu-latest
270+
runs-on: ubuntu-22.04
271271
container: quay.io/pypa/manylinux_2_28_x86_64
272272
steps:
273273
- uses: actions/checkout@v4
@@ -281,7 +281,7 @@ jobs:
281281
matrix:
282282
version: ["3.8", "3.11"]
283283
needs: build-py-generation
284-
runs-on: ubuntu-latest
284+
runs-on: ubuntu-22.04
285285
steps:
286286
- uses: actions/checkout@v4
287287
- uses: ./.github/actions/test-py
@@ -294,7 +294,7 @@ jobs:
294294
strategy:
295295
matrix:
296296
version: ["3.8", "3.11"]
297-
runs-on: ubuntu-latest
297+
runs-on: ubuntu-22.04
298298
steps:
299299
- uses: actions/checkout@v4
300300
- uses: ./.github/actions/test-py
@@ -307,7 +307,7 @@ jobs:
307307
strategy:
308308
matrix:
309309
version: ["3.8", "3.11"]
310-
runs-on: ubuntu-latest
310+
runs-on: ubuntu-22.04
311311
steps:
312312
- uses: actions/checkout@v4
313313
- uses: ./.github/actions/test-py
@@ -318,15 +318,15 @@ jobs:
318318

319319
test-docs:
320320
if: github.event.pull_request.draft == false
321-
runs-on: ubuntu-latest
321+
runs-on: ubuntu-22.04
322322
steps:
323323
- uses: actions/checkout@v4
324324
- uses: ./.github/actions/test-docs
325325

326326
codecov:
327327
if: github.event.pull_request.draft == false
328328
needs: merge-test-artifacts
329-
runs-on: ubuntu-latest
329+
runs-on: ubuntu-22.04
330330
steps:
331331
- uses: actions/checkout@v4
332332
- name: Install dependencies
@@ -354,7 +354,7 @@ jobs:
354354
permissions:
355355
contents: write
356356
needs: [test-docs, merge-test-artifacts]
357-
runs-on: ubuntu-latest
357+
runs-on: ubuntu-22.04
358358
steps:
359359
- uses: actions/checkout@v4
360360
- name: Install dependencies

pycode/memilio-epidata/setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ def run(self):
9191
'pyxlsb',
9292
'wget',
9393
'twill==3.1',
94+
# set PyQt6-sip version as the one pulled by PyQt6 in Epidata-CI (using manylinux_2_28_x86_64) req. python 3.9
95+
'PyQt6-sip<13.9',
9496
'PyQt6',
9597
'python-calamine',
9698
pymagic

0 commit comments

Comments
 (0)