diff --git a/.github/workflows/codspeed.yml b/.github/workflows/codspeed.yml index 6951d119e4..24d453280c 100644 --- a/.github/workflows/codspeed.yml +++ b/.github/workflows/codspeed.yml @@ -32,4 +32,4 @@ jobs: uses: CodSpeedHQ/action@v4 with: mode: walltime - run: hatch run test.py3.11-2.0-minimal:pytest tests/benchmarks --codspeed + run: hatch run test.py3.11-minimal:pytest tests/benchmarks --codspeed diff --git a/.github/workflows/gpu_test.yml b/.github/workflows/gpu_test.yml index d81cd896b9..6011610681 100644 --- a/.github/workflows/gpu_test.yml +++ b/.github/workflows/gpu_test.yml @@ -19,13 +19,12 @@ concurrency: jobs: test: - name: py=${{ matrix.python-version }}, np=${{ matrix.numpy-version }}, deps=${{ matrix.dependency-set }} + name: py=${{ matrix.python-version }}, deps=${{ matrix.dependency-set }} runs-on: gpu-runner strategy: matrix: python-version: ['3.11'] - numpy-version: ['2.2'] dependency-set: ["minimal"] steps: @@ -61,11 +60,11 @@ jobs: pip install hatch - name: Set Up Hatch Env run: | - hatch env create gputest.py${{ matrix.python-version }}-${{ matrix.numpy-version }}-${{ matrix.dependency-set }} - hatch env run -e gputest.py${{ matrix.python-version }}-${{ matrix.numpy-version }}-${{ matrix.dependency-set }} list-env + hatch env create gputest.py${{ matrix.python-version }}-${{ matrix.dependency-set }} + hatch env run -e gputest.py${{ matrix.python-version }}-${{ matrix.dependency-set }} list-env - name: Run Tests run: | - hatch env run --env gputest.py${{ matrix.python-version }}-${{ matrix.numpy-version }}-${{ matrix.dependency-set }} run-coverage-gpu + hatch env run --env gputest.py${{ matrix.python-version }}-${{ matrix.dependency-set }} run-coverage-gpu - name: Upload coverage uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1 diff --git a/.github/workflows/hypothesis.yaml b/.github/workflows/hypothesis.yaml index 96dbcaa6f6..abf7c5f4ce 100644 --- a/.github/workflows/hypothesis.yaml +++ b/.github/workflows/hypothesis.yaml @@ -24,7 +24,6 @@ jobs: strategy: matrix: python-version: ['3.12'] - numpy-version: ['2.2'] dependency-set: ["optional"] steps: @@ -47,8 +46,8 @@ jobs: pip install hatch - name: Set Up Hatch Env run: | - hatch env create test.py${{ matrix.python-version }}-${{ matrix.numpy-version }}-${{ matrix.dependency-set }} - hatch env run -e test.py${{ matrix.python-version }}-${{ matrix.numpy-version }}-${{ matrix.dependency-set }} list-env + hatch env create test.py${{ matrix.python-version }}-${{ matrix.dependency-set }} + hatch env run -e test.py${{ matrix.python-version }}-${{ matrix.dependency-set }} list-env # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache - name: Restore cached hypothesis directory id: restore-hypothesis-cache @@ -64,7 +63,7 @@ jobs: id: status run: | echo "Using Hypothesis profile: $HYPOTHESIS_PROFILE" - hatch env run --env test.py${{ matrix.python-version }}-${{ matrix.numpy-version }}-${{ matrix.dependency-set }} run-hypothesis + hatch env run --env test.py${{ matrix.python-version }}-${{ matrix.dependency-set }} run-hypothesis # explicitly save the cache so it gets updated, also do this even if it fails. - name: Save cached hypothesis directory diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d5cb568288..15fe94d3f9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,29 +16,27 @@ concurrency: jobs: test: - name: os=${{ matrix.os }}, py=${{ matrix.python-version }}, np=${{ matrix.numpy-version }}, deps=${{ matrix.dependency-set }} + name: os=${{ matrix.os }}, py=${{ matrix.python-version }}, deps=${{ matrix.dependency-set }} strategy: matrix: python-version: ['3.11', '3.12', '3.13'] - numpy-version: ['2.0', '2.2'] dependency-set: ["minimal", "optional"] os: ["ubuntu-latest"] include: - python-version: '3.11' - numpy-version: '2.0' dependency-set: 'optional' os: 'macos-latest' + - python-version: '3.13' - numpy-version: '2.2' dependency-set: 'optional' os: 'macos-latest' + - python-version: '3.11' - numpy-version: '2.0' dependency-set: 'optional' os: 'windows-latest' + - python-version: '3.13' - numpy-version: '2.2' dependency-set: 'optional' os: 'windows-latest' runs-on: ${{ matrix.os }} @@ -58,13 +56,13 @@ jobs: pip install hatch - name: Set Up Hatch Env run: | - hatch env create test.py${{ matrix.python-version }}-${{ matrix.numpy-version }}-${{ matrix.dependency-set }} - hatch env run -e test.py${{ matrix.python-version }}-${{ matrix.numpy-version }}-${{ matrix.dependency-set }} list-env + hatch env create test.py${{ matrix.python-version }}-${{ matrix.dependency-set }} + hatch env run -e test.py${{ matrix.python-version }}-${{ matrix.dependency-set }} list-env - name: Run Tests env: HYPOTHESIS_PROFILE: ci run: | - hatch env run --env test.py${{ matrix.python-version }}-${{ matrix.numpy-version }}-${{ matrix.dependency-set }} run-coverage + hatch env run --env test.py${{ matrix.python-version }}-${{ matrix.dependency-set }} run-coverage - name: Upload coverage if: ${{ matrix.dependency-set == 'optional' && matrix.os == 'ubuntu-latest' }} uses: codecov/codecov-action@v5 @@ -152,4 +150,4 @@ jobs: contains(needs.*.result, 'cancelled') run: exit 1 - name: Success - run: echo Success! + run: echo Success! \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index bc0b97d3e0..4e9e16730a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -152,9 +152,6 @@ version.source = "vcs" hooks.vcs.version-file = "src/zarr/_version.py" [tool.hatch.envs.test] -dependencies = [ - "numpy~={matrix:numpy}", -] features = ["test"] [tool.hatch.envs.test.env-vars] @@ -165,7 +162,6 @@ COV_CORE_DATAFILE = ".coverage.eager" [[tool.hatch.envs.test.matrix]] python = ["3.11", "3.12", "3.13"] -numpy = ["2.0", "2.2"] deps = ["minimal", "optional"] [tool.hatch.envs.test.overrides] @@ -188,14 +184,12 @@ list-env = "pip list" [tool.hatch.envs.gputest] template = "test" dependencies = [ - "numpy~={matrix:numpy}", "universal_pathlib", ] features = ["test", "gpu"] [[tool.hatch.envs.gputest.matrix]] python = ["3.11", "3.12", "3.13"] -numpy = ["2.0", "2.2"] version = ["minimal"] [tool.hatch.envs.gputest.scripts]