Skip to content

Commit aff7bd8

Browse files
committed
Re-enable integration test CI
1 parent 0307c77 commit aff7bd8

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ jobs:
6767
name: Unittest report ${{ matrix.os }}-${{ matrix.pixi-environment }}
6868
path: ${{ env.COVERAGE_REPORT }}
6969
integration-test:
70-
# TODO v4: Re-enable the workflow once development has stabilized and we want to run integration tests again
71-
if: false
7270
name: "Integration: ${{ matrix.os }} | pixi run -e ${{ matrix.pixi-environment }} tests-notebooks"
7371
runs-on: ${{ matrix.os }}-latest
7472
needs: [cache-pixi-lock]
@@ -78,10 +76,10 @@ jobs:
7876
fail-fast: false
7977
matrix:
8078
os: [ubuntu] #, mac, windows] # TODO v4: Re-enable windows and mac
81-
python-version: ["3.12"]
79+
pixi-environment: ["test-notebooks-latest"]
8280
include:
8381
- os: ubuntu
84-
python-version: "3.11"
82+
pixi-environment: test-notebooks-py311
8583
steps:
8684
- uses: actions/checkout@v5
8785
- name: Restore cached pixi lockfile
@@ -98,7 +96,7 @@ jobs:
9896
cache-write: ${{ github.event_name == 'push' && github.ref_name == 'v4-dev' }} # TODO: Update v4-dev to main when v4 is released
9997
- name: Integration test
10098
run: |
101-
pixi run test-notebooks -v -s --html="${{ env.COVERAGE_REPORT }}" --self-contained-html --cov=parcels --cov-report=xml
99+
pixi run -e ${{matrix.pixi-environment}} test-notebooks -v -s --html="${{ env.COVERAGE_REPORT }}" --self-contained-html --cov=parcels --cov-report=xml
102100
- name: Codecov
103101
uses: codecov/[email protected]
104102
env:

pixi.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ test-latest = { features = ["test"], solve-group = "test" }
2121
test-minimum = { features = ["test", "minimum"], solve-group = "test" }
2222
test-py311 = { features = ["test", "py311"] }
2323
test-py313 = { features = ["test", "py313"] }
24-
test-notebooks = { features = ["test", "notebooks"], solve-group = "test" }
24+
test-notebooks-latest = { features = ["test", "notebooks"] }
25+
test-notebooks-py311 = { features = ["test", "notebooks"] }
2526
docs = { features = ["docs"], solve-group = "docs" }
2627
typing = { features = ["typing"], solve-group = "typing" }
2728
pre-commit = { features = ["pre-commit"], no-default-feature = true }

0 commit comments

Comments
 (0)