diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31c9801a8..0211196f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,8 +67,6 @@ jobs: name: Unittest report ${{ matrix.os }}-${{ matrix.pixi-environment }} path: ${{ env.COVERAGE_REPORT }} integration-test: - # TODO v4: Re-enable the workflow once development has stabilized and we want to run integration tests again - if: false name: "Integration: ${{ matrix.os }} | pixi run -e ${{ matrix.pixi-environment }} tests-notebooks" runs-on: ${{ matrix.os }}-latest needs: [cache-pixi-lock] @@ -78,10 +76,10 @@ jobs: fail-fast: false matrix: os: [ubuntu] #, mac, windows] # TODO v4: Re-enable windows and mac - python-version: ["3.12"] + pixi-environment: ["test-notebooks-latest"] include: - os: ubuntu - python-version: "3.11" + pixi-environment: test-notebooks-py311 steps: - uses: actions/checkout@v5 - name: Restore cached pixi lockfile @@ -98,7 +96,7 @@ jobs: cache-write: ${{ github.event_name == 'push' && github.ref_name == 'v4-dev' }} # TODO: Update v4-dev to main when v4 is released - name: Integration test run: | - pixi run test-notebooks -v -s --html="${{ env.COVERAGE_REPORT }}" --self-contained-html --cov=parcels --cov-report=xml + pixi run -e ${{matrix.pixi-environment}} tests-notebooks -v -s --html="${{ env.COVERAGE_REPORT }}" --self-contained-html --cov=parcels --cov-report=xml - name: Codecov uses: codecov/codecov-action@v5.5.1 env: diff --git a/pixi.toml b/pixi.toml index 5ce112b53..60bc7888b 100644 --- a/pixi.toml +++ b/pixi.toml @@ -21,7 +21,8 @@ test-latest = { features = ["test"], solve-group = "test" } test-minimum = { features = ["test", "minimum"], solve-group = "test" } test-py311 = { features = ["test", "py311"] } test-py313 = { features = ["test", "py313"] } -test-notebooks = { features = ["test", "notebooks"], solve-group = "test" } +test-notebooks-latest = { features = ["test", "notebooks"] } +test-notebooks-py311 = { features = ["test", "notebooks", "py311"] } docs = { features = ["docs"], solve-group = "docs" } typing = { features = ["typing"], solve-group = "typing" } pre-commit = { features = ["pre-commit"], no-default-feature = true }