Skip to content

Commit

Permalink
reapply division changes that was lost when rebasing
Browse files Browse the repository at this point in the history
  • Loading branch information
AgnieszkaZaba committed Dec 11, 2024
1 parent 62e0478 commit 736f54e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 14 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
matrix:
platform: [ubuntu-latest, macos-13, macos-14, windows-latest]
python-version: ["3.9", "3.12"]
test-suite: ["unit_tests/!(dynamics)", "unit_tests/dynamics/!(condensation)", "unit_tests/dynamics/condensation", "smoke_tests/no_env", "smoke_tests/box", "smoke_tests/parcel_a", "smoke_tests/parcel_b", "smoke_tests/parcel_c", "smoke_tests/parcel_d", "smoke_tests/kinematic_1d", "smoke_tests/kinematic_2d", "tutorials_tests"]
test-suite: ["unit_tests/!(dynamics)", "unit_tests/dynamics/!(collisions)", "unit_tests/dynamics/collisions", "smoke_tests/no_env", "smoke_tests/box", "smoke_tests/parcel_a", "smoke_tests/parcel_b", "smoke_tests/parcel_c", "smoke_tests/parcel_d", "smoke_tests/kinematic_1d", "smoke_tests/kinematic_2d", "tutorials_tests"]
exclude:
- platform: "macos-14"
python-version: "3.9"
Expand All @@ -126,7 +126,7 @@ jobs:
test-suite: "unit_tests/!(dynamics)"
fail-fast: false
runs-on: ${{ matrix.platform }}
timeout-minutes: ${{ startsWith(matrix.platform, 'windows-') && 35 || 35 }}
timeout-minutes: ${{ startsWith(matrix.platform, 'windows-') && 35 || 25 }}
steps:
- uses: actions/[email protected]
with:
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- run: |
echo pip_user_site=$(python -c "import sysconfig; print(sysconfig.get_path('purelib'))") >> $GITHUB_ENV
echo toml_ci_md5=$(cat pyproject.toml setup.py examples/pyproject.toml examples/setup.py tests/devops_tests/requirements.txt .github/workflows/tests+artifacts+pypi.yml \
echo toml_ci_md5=$(cat pyproject.toml setup.py examples/pyproject.toml examples/setup.py tests/devops_tests/requirements.txt .github/workflows/tests.yml \
| python -c "import hashlib;print(hashlib.md5(open(0,'rb').read()).hexdigest())") >> $GITHUB_ENV
- uses: actions/cache@v4
id: cache
Expand All @@ -211,10 +211,10 @@ jobs:
matrix:
platform: [ubuntu-24.04, macos-13, windows-latest]
python-version: ["3.9", "3.12"]
test-suite: [ "chemistry_freezing_isotopes_a", "chemistry_freezing_isotopes_b", "condensation_a", "condensation_b", "condensation_c", "coagulation", "breakup", "multi-process_a", "multi-process_b", "multi-process_c", "multi-process_d"]
test-suite: [ "chemistry_freezing_isotopes_a", "chemistry_freezing_isotopes_b", "condensation_a", "condensation_b", "condensation_c", "coagulation", "breakup", "multi-process_a", "multi-process_b", "multi-process_c", "multi-process_d", "multi-process_e"]
fail-fast: false
runs-on: ${{ matrix.platform }}
timeout-minutes: ${{ !startsWith(matrix.platform, 'ubuntu-') && 35 || 35 }}
timeout-minutes: ${{ !startsWith(matrix.platform, 'ubuntu-') && 30 || 35 }}
steps:
- uses: actions/[email protected]
with:
Expand All @@ -225,7 +225,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- run: |
echo pip_user_site=$(python -c "import sysconfig; print(sysconfig.get_path('purelib'))") >> $GITHUB_ENV
echo toml_ci_md5=$(cat pyproject.toml setup.py examples/pyproject.toml examples/setup.py tests/devops_tests/requirements.txt .github/workflows/tests+artifacts+pypi.yml \
echo toml_ci_md5=$(cat pyproject.toml setup.py examples/pyproject.toml examples/setup.py tests/devops_tests/requirements.txt .github/workflows/tests.yml \
| python -c "import hashlib;print(hashlib.md5(open(0,'rb').read()).hexdigest())") >> $GITHUB_ENV
- run: |
rm -rf $pip_user_site
Expand Down
18 changes: 10 additions & 8 deletions tests/examples_tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ def findfiles(path, regex):
"Bolot_et_al_2013",
"Merlivat_and_Nief_1967",
"Van_Hook_1968",
"Pierchala_et_al_2022",
"Gedzelman_and_Arnold_1994",
],
"chemistry_freezing_isotopes_b": [
"Pierchala_et_al_2022",
"Gedzelman_and_Arnold_1994",
"Graf_et_al_2019",
"Lamb_et_al_2017",
"Miyake_et_al_1968",
Expand All @@ -54,19 +54,21 @@ def findfiles(path, regex):
"breakup": ["Bieli_et_al_2022", "deJong_Mackay_et_al_2023", "Srivastava_1982"],
"multi-process_a": [
"Arabas_et_al_2015",
"Arabas_et_al_2023",
],
"multi-process_b": [
"Bartman_2020_MasterThesis",
"Morrison_and_Grabowski_2007",
"Arabas_et_al_2023",
],
"multi-process_c": [
"Bulenok_2023_MasterThesis",
"Bartman_2020_MasterThesis",
],
"multi-process_d": [
"Bartman_et_al_2021",
],
"multi-process_e": [
"deJong_Azimi",
"Szumowski_et_al_1998",
],
"multi-process_d": [
"Bulenok_2023_MasterThesis",
"Morrison_and_Grabowski_2007",
"Shipway_and_Hill_2012",
"seeding",
"_HOWTOs",
Expand Down

0 comments on commit 736f54e

Please sign in to comment.