Skip to content
Merged
Show file tree
Hide file tree
Changes from 61 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
6dfd3a1
Add nox session and utilities for conditionally running tests based o…
egparedes Apr 15, 2025
5fb4a81
Add name matching mechanism for selecting which env variable are pass…
egparedes Apr 15, 2025
b032f35
Merge branch 'main' into new-conditionals
egparedes Apr 15, 2025
e24eaeb
Refactor to get conditional activation flag from the environment
egparedes Apr 15, 2025
bd66f86
WIP: fixes
egparedes Apr 15, 2025
eeb2709
More fixes
egparedes Apr 15, 2025
b945f52
Large refactoring moving all utilities to a different file
egparedes Apr 16, 2025
a74bdb6
Cleanups and fixes
egparedes Apr 16, 2025
c483e64
Test calling new nox way for eve from Github actions instead of fallback
egparedes Apr 16, 2025
f0d5c82
Cleanups and fixes
egparedes Apr 16, 2025
3fd76e8
Fix
egparedes Apr 16, 2025
4ece1f1
Try git diff changes
egparedes Apr 16, 2025
3456cb6
Print to stderr in verbose mode
egparedes Apr 16, 2025
fcc242c
Put back "origin/"
egparedes Apr 16, 2025
0a30b09
Add docstrigngs and fix verbose mode bug
egparedes Apr 16, 2025
03275fb
Use lightweight launch venv with only nox
egparedes Apr 16, 2025
b3655ca
Improve docstrings
egparedes Apr 16, 2025
b7aa661
Merge branch 'main' into new-conditionals
egparedes Apr 16, 2025
a6eed30
Fix bug
egparedes Apr 16, 2025
e8f0497
Read python versions from file
egparedes Apr 16, 2025
23980d7
Update noxfile_utils.py
egparedes Apr 16, 2025
a4be642
Update noxfile.py
egparedes Apr 16, 2025
019cf6c
Use uvx for nox
egparedes Apr 17, 2025
08ea3c5
Fixes
egparedes Apr 17, 2025
3ea0c5e
Cleanups and fixes
egparedes Apr 17, 2025
763f903
Adding unit tests
egparedes Apr 17, 2025
0001431
Tests cleanups
egparedes Apr 17, 2025
d476732
Finish unit tests
egparedes Apr 17, 2025
052bbaf
Cleanups and docs enhancements
egparedes Apr 22, 2025
bda11db
Update GitHub actions
egparedes Apr 22, 2025
ede2ad3
Missing edit from previous commit
egparedes Apr 22, 2025
48c0dd7
Fix env var names
egparedes Apr 22, 2025
7ca8037
Fix env vars prefix
egparedes Apr 22, 2025
dc06e36
Add utility to create env dicts and other cleanups
egparedes Apr 22, 2025
61643d4
Merge branch 'main' into new-conditionals
egparedes Apr 22, 2025
9c688f0
Add run_session util to create the env automatically
egparedes Apr 22, 2025
cd77635
Copilot review suggestions
egparedes Apr 23, 2025
520acf8
Merge branch 'main' into new-conditionals
egparedes Apr 23, 2025
e9fcdfd
fix
egparedes Apr 24, 2025
60ccc5b
Change development docs
egparedes Apr 24, 2025
4c4937d
Fix style
egparedes Apr 24, 2025
afe48dd
Fix noxfile calls to run_session and other cleanups
egparedes Apr 24, 2025
8d7ac17
Update nox version and remove unneeded env filtering feature from nox…
egparedes Apr 24, 2025
3b8f38b
Fix unnecessary deep clones in actions and a bug in dev-tasks.py
egparedes May 6, 2025
9477463
Merge branch 'main' into new-conditionals
egparedes May 6, 2025
641d521
Add missing changes from previous commit
egparedes May 6, 2025
7f7917a
Change import mechanism for noxfile_utils
egparedes May 6, 2025
8802cc7
More cleanups, add is_affected session and update docs.
egparedes May 7, 2025
e604f44
Replace `uvx nox` by `uv run noxfile.py` in github actions, as suppor…
egparedes May 7, 2025
3b6b25d
Doctrsing fixes
egparedes May 7, 2025
983e73d
Move noxfile_utils tests from nox to pre-commit
egparedes May 7, 2025
2312e0f
Add assert for safety
egparedes May 7, 2025
19105af
Fix noxfile tests in pre-commit
egparedes May 7, 2025
3d895d3
Update docs/development/tools/ci-infrastructure.md
egparedes May 7, 2025
ca0140f
Update docs/development/tools/ci-infrastructure.md
egparedes May 7, 2025
27a4946
Final cleanups
egparedes May 7, 2025
1911ab4
Get rid of custom NUM_PROCESSES variable and use standard PYTEST_XDIS…
egparedes May 7, 2025
c43de08
Remove unused git diff cache from noxfile_utils
egparedes May 7, 2025
3cf2b4a
Fix typos
egparedes May 7, 2025
72a1815
Merge branch 'main' into new-conditionals
egparedes May 7, 2025
c6429f4
More cleanups
egparedes May 7, 2025
cddca1a
Clean up pre-commit tests for noxfile_utils
egparedes May 8, 2025
3f8e49d
Increase slurm time limit for cscs-ci
egparedes May 8, 2025
8ed755a
Test CSCS-cI changes
egparedes May 8, 2025
53e7bb4
Try again
egparedes May 8, 2025
0124e4e
Another try following Andreas Fink tip
egparedes May 8, 2025
2c252f3
Fix typos
egparedes May 8, 2025
2033c6c
Add missing `jq` tools to base dockerfile
egparedes May 8, 2025
05b8220
Merge branch 'main' into new-conditionals
egparedes May 8, 2025
22bc05c
Add github remote in actual docker image
egparedes May 8, 2025
0dbd2ff
More fixes
egparedes May 8, 2025
21deb87
Add noxfile_utils.py to session path filters
egparedes May 8, 2025
c3453d5
Rename commit_spec variables
egparedes May 8, 2025
67ac9e0
Remove unneeded list
egparedes May 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Use a deep clone to get the correct version from tags

- name: Set up Python
uses: actions/setup-python@v5
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/daily-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ jobs:
python-versions: ${{ steps.get-versions.outputs.python-versions }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Use a deep clone to get the correct version from tags

- id: get-versions
uses: ./.github/actions/get-python-versions

Expand All @@ -41,8 +40,6 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Use a deep clone to get the correct version from tags

- name: Install uv and set the python version
uses: astral-sh/setup-uv@v5
Expand All @@ -53,12 +50,11 @@ jobs:

- name: Run CPU tests for '${{ matrix.gt4py-module }}' with '${{ matrix.dependencies-strategy }}' resolution strategy
env:
NUM_PROCESSES: auto
UV_RESOLUTION: ${{ matrix.dependencies-strategy }}
# Force a specific compiler for setuptools/distutils (used in gt4py.cartesian)
CXX: g++
CC: gcc
run: uv run nox -s 'test_${{ matrix.gt4py-module }}-${{ matrix.python-version }}' -t 'cpu'
run: uv run --script noxfile.py -s 'test_${{ matrix.gt4py-module }}-${{ matrix.python-version }}' -t 'cpu'

- name: Notify slack
if: ${{ failure() }}
Expand All @@ -75,7 +71,7 @@ jobs:
"type": "section",
"text": {
"type": "mrkdwn",
"text": "Failed tests: <https://github.com/GridTools/gt4py/actions/runs/${{ github.run_id }}|${{ github.workflow }}: **${{ matrix.gt4py-module }} (CPU)** for **Python-${{ matrix.python-version }}** with **'${{ matrix.dependencies-strategy }}' uv resolution strategy**.>"
"text": "Failed tests: <https://github.com/GridTools/gt4py/actions/runs/${{ github.run_id }}|${{ github.workflow }}: ${{ matrix.gt4py-module }} (CPU) for Python-${{ matrix.python-version }} with '${{ matrix.dependencies-strategy }}' uv resolution strategy.>"
}
}
]
Expand Down
34 changes: 0 additions & 34 deletions .github/workflows/test-cartesian-fallback.yml

This file was deleted.

15 changes: 6 additions & 9 deletions .github/workflows/test-cartesian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ on:
pull_request:
branches:
- main
paths-ignore: # Skip when only gt4py.next or doc files have been updated
- "src/gt4py/next/**"
- "tests/next_tests/**"
- "examples/**"
- "*.md"
- "*.rst"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -29,7 +23,7 @@ jobs:
- id: get-versions
uses: ./.github/actions/get-python-versions

# Main job that runs the tests
# Test-running job
test-cartesian:
needs: get-python-versions
strategy:
Expand All @@ -42,6 +36,8 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Use a deep clone to get target PR branch

- name: Install uv and set the python version
uses: astral-sh/setup-uv@v5
Expand All @@ -52,9 +48,10 @@ jobs:

- name: Run CPU 'cartesian' tests with nox
env:
NUM_PROCESSES: auto
CI_NOX_RUN_ONLY_IF_CHANGED_FROM: "origin/${{ github.base_ref }}"
CI_NOX_VERBOSE: 1
# Force a specific compiler for setuptools/distutils
CXX: g++
CC: gcc
shell: bash
run: uv run nox -s 'test_cartesian-${{ matrix.python-version }}(${{ matrix.codegen-factor }}, cpu)'
run: uv run --script noxfile.py -s 'test_cartesian-${{ matrix.python-version }}(${{ matrix.codegen-factor }}, cpu)'
38 changes: 0 additions & 38 deletions .github/workflows/test-eve-fallback.yml

This file was deleted.

15 changes: 6 additions & 9 deletions .github/workflows/test-eve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@ on:
pull_request:
branches:
- main
paths: # Run when gt4py.eve files (or package settings) are changed
- "src/gt4py/eve/**"
- "tests/eve_tests/**"
- ".github/workflows/**"
- "*.lock"
- "*.toml"
- "*.yml"

jobs:
# First job to read Python versions from .python-versions file
Expand All @@ -26,6 +19,7 @@ jobs:
- id: get-versions
uses: ./.github/actions/get-python-versions

# Test-running job
test-eve:
needs: get-python-versions
strategy:
Expand All @@ -37,6 +31,8 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Use a deep clone to get target PR branch

- name: Install uv and set the python version
uses: astral-sh/setup-uv@v5
Expand All @@ -47,6 +43,7 @@ jobs:

- name: Run 'eve' tests with nox
env:
NUM_PROCESSES: auto
CI_NOX_RUN_ONLY_IF_CHANGED_FROM: "origin/${{ github.base_ref }}"
CI_NOX_VERBOSE: 1
shell: bash
run: uv run nox -s test_eve-${{ matrix.python-version }}
run: uv run --script noxfile.py -s test_eve-${{ matrix.python-version }}
5 changes: 2 additions & 3 deletions .github/workflows/test-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
- id: get-versions
uses: ./.github/actions/get-python-versions

# Test-running job
test-notebooks:
needs: get-python-versions
strategy:
Expand All @@ -39,7 +40,5 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: Run 'docs' nox session
env:
NUM_PROCESSES: auto
shell: bash
run: uv run nox -s 'test_examples-${{ matrix.python-version }}'
run: uv run --script noxfile.py -s 'test_examples-${{ matrix.python-version }}'
36 changes: 0 additions & 36 deletions .github/workflows/test-next-fallback.yml

This file was deleted.

14 changes: 6 additions & 8 deletions .github/workflows/test-next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ on:
pull_request:
branches:
- main
paths-ignore: # Skip when only gt4py.cartesian or doc files have been updated
- "src/gt4py/cartesian/**"
- "tests/cartesian_tests/**"
- "examples/**"
- "*.md"
- "*.rst"

jobs:
# First job to read Python versions from .python-versions file
Expand All @@ -25,6 +19,7 @@ jobs:
- id: get-versions
uses: ./.github/actions/get-python-versions

# Test-running job
test-next:
needs: get-python-versions
strategy:
Expand All @@ -38,6 +33,8 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Use a deep clone to get target PR branch

- name: Install uv and set the python version
uses: astral-sh/setup-uv@v5
Expand All @@ -48,6 +45,7 @@ jobs:

- name: Run CPU 'next' tests with nox
env:
NUM_PROCESSES: auto
CI_NOX_RUN_ONLY_IF_CHANGED_FROM: "origin/${{ github.base_ref }}"
CI_NOX_VERBOSE: 1
shell: bash
run: uv run nox -s 'test_next-${{ matrix.python-version }}(${{ matrix.codegen-factor }}, cpu, ${{ matrix.mesh-factor }})'
run: uv run --script noxfile.py -s 'test_next-${{ matrix.python-version }}(${{ matrix.codegen-factor }}, cpu, ${{ matrix.mesh-factor }})'
5 changes: 2 additions & 3 deletions .github/workflows/test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
- id: get-versions
uses: ./.github/actions/get-python-versions

# Test-running job
test-package:
needs: get-python-versions
strategy:
Expand All @@ -39,7 +40,5 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: Run 'package' tests with nox
env:
NUM_PROCESSES: auto
shell: bash
run: uv run nox -s test_package-${{ matrix.python-version }}
run: uv run --script noxfile.py -s test_package-${{ matrix.python-version }}
39 changes: 0 additions & 39 deletions .github/workflows/test-storage-fallback.yml

This file was deleted.

Loading
Loading