Skip to content

Commit b8dedee

Browse files
authored
CI: run examples on macos-14 instead of macos-13; drop example execution on P3.9 (smoke tests will still run on P3.9); merge 6 example sets into 3 (thanks to shorter execution times) (#1694)
1 parent 6d0886f commit b8dedee

File tree

3 files changed

+27
-29
lines changed

3 files changed

+27
-29
lines changed

.github/workflows/tests.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
test-suite: "smoke_tests/kinematic_2d"
102102
- platform: "macos-14"
103103
test-suite: "unit_tests/!(dynamics)"
104-
fail-fast: false
104+
fail-fast: true
105105
runs-on: ${{ matrix.platform }}
106106
timeout-minutes: ${{ startsWith(matrix.platform, 'ubuntu-') && 25 || 40 }}
107107
steps:
@@ -145,7 +145,7 @@ jobs:
145145
needs: [nojit_and_codecov]
146146
strategy:
147147
matrix:
148-
platform: [ubuntu-24.04, macos-13, windows-latest]
148+
platform: [ubuntu-24.04, macos-14, windows-latest]
149149
python-version: ["3.9", "3.12"]
150150
runs-on: ${{ matrix.platform }}
151151
steps:
@@ -182,12 +182,12 @@ jobs:
182182
needs: [examples-setup]
183183
strategy:
184184
matrix:
185-
platform: [ubuntu-24.04, macos-13, windows-latest]
186-
python-version: ["3.9", "3.12"]
187-
test-suite: [ "chemistry_extraterrestrial", "freezing", "isotopes", "condensation_a", "condensation_b", "condensation_c", "coagulation", "breakup", "multi-process_a", "multi-process_b", "multi-process_c", "multi-process_d", "multi-process_e"]
188-
fail-fast: false
185+
platform: [ubuntu-24.04, macos-14, windows-latest]
186+
python-version: ["3.12"]
187+
test-suite: [ "isotopes_chemistry_extraterrestrial", "coagulation_freezing", "condensation_a", "condensation_b", "condensation_c", "multi-process_a", "multi-process_b", "multi-process_c_breakup", "multi-process_d", "multi-process_e"]
188+
fail-fast: true
189189
runs-on: ${{ matrix.platform }}
190-
timeout-minutes: ${{ startsWith(matrix.platform, 'ubuntu-') && 20 || 35 }}
190+
timeout-minutes: ${{ startsWith(matrix.platform, 'windows-') && 35 || 20 }}
191191
steps:
192192
- uses: actions/[email protected]
193193
with:
@@ -242,12 +242,8 @@ jobs:
242242
- run: |
243243
python -m pytest ${{ env.pytest_options }} tests/examples_tests/test_tests_completeness.py
244244
245-
# TODO #1207
246-
- if: startsWith(matrix.platform, 'macos-13')
247-
run: python -m pytest --basetemp=/tmp/pytest ${{ env.pytest_options }} tests/examples_tests/test_run* -k "not (Rozanski_and_Sonntag_1982 or copula_hello)" --suite ${{ matrix.test-suite }}
248-
249-
- if: ( ! startsWith(matrix.platform, 'macos-13') )
250-
run: python -m pytest ${{ env.pytest_options }} --basetemp=/tmp/pytest --timeout_method=thread --timeout=${{ startsWith(matrix.platform, 'windows-') && 1000 || 900 }} tests/examples_tests/test_run* --suite ${{ matrix.test-suite }}
245+
- run: |
246+
python -m pytest ${{ env.pytest_options }} --basetemp=/tmp/pytest --timeout_method=thread --timeout=${{ startsWith(matrix.platform, 'windows-') && 1000 || 900 }} tests/examples_tests/test_run* --suite ${{ matrix.test-suite }}
251247
252248
- if: ( ! startsWith(matrix.platform, 'windows-') ) && matrix.test-suite == env.anim_test-suite && matrix.python-version == env.anim_python-version
253249
run: |

examples/setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import os
2+
import platform
23
import re
34
import sys
45

@@ -42,7 +43,7 @@ def get_long_description():
4243
]
4344
+ (
4445
["pyvinecopulib" + ("==0.7.3" if CI else ">=0.7.3")]
45-
if sys.platform != "darwin"
46+
if not (sys.platform == "darwin" and platform.machine() == "x86_64")
4647
else []
4748
),
4849
extras_require={

tests/examples_tests/conftest.py

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,7 @@ def findfiles(path, regex):
1616

1717

1818
TEST_SUITES = {
19-
"chemistry_extraterrestrial": [
20-
"Jaruga_and_Pawlowska_2018",
21-
"Kreidenweis_et_al_2003",
22-
"Toon_et_al_1980",
23-
],
24-
"freezing": [
25-
"Alpert_and_Knopf_2016",
26-
"Ervens_and_Feingold_2012",
27-
"Niedermeier_et_al_2014",
28-
"Spichtinger_et_al_2023",
29-
],
30-
"isotopes": [
19+
"isotopes_chemistry_extraterrestrial": [
3120
"Bolot_et_al_2013",
3221
"Merlivat_and_Nief_1967",
3322
"Van_Hook_1968",
@@ -43,6 +32,9 @@ def findfiles(path, regex):
4332
"Pruppacher_and_Rasmussen_1979",
4433
"Fisher_1991",
4534
"Jouzel_and_Merlivat_1984",
35+
"Jaruga_and_Pawlowska_2018",
36+
"Kreidenweis_et_al_2003",
37+
"Toon_et_al_1980",
4638
],
4739
"condensation_a": [
4840
"Lowe_et_al_2019",
@@ -60,17 +52,26 @@ def findfiles(path, regex):
6052
"Jensen_and_Nugent_2017",
6153
"Abade_and_Albuquerque_2024",
6254
],
63-
"coagulation": ["Berry_1967", "Shima_et_al_2009"],
64-
"breakup": ["Bieli_et_al_2022", "deJong_Mackay_et_al_2023", "Srivastava_1982"],
55+
"coagulation_freezing": [
56+
"Berry_1967",
57+
"Shima_et_al_2009",
58+
"Alpert_and_Knopf_2016",
59+
"Ervens_and_Feingold_2012",
60+
"Niedermeier_et_al_2014",
61+
"Spichtinger_et_al_2023",
62+
],
6563
"multi-process_a": [
6664
"Arabas_et_al_2015",
6765
"_HOWTOs",
6866
],
6967
"multi-process_b": [
7068
"Arabas_et_al_2025",
7169
],
72-
"multi-process_c": [
70+
"multi-process_c_breakup": [
7371
"Bartman_2020_MasterThesis",
72+
"Bieli_et_al_2022",
73+
"deJong_Mackay_et_al_2023",
74+
"Srivastava_1982",
7475
],
7576
"multi-process_d": [
7677
"Bartman_et_al_2021",

0 commit comments

Comments
 (0)