Skip to content

Commit 4e180f7

Browse files
committed
Simplify testing of different numpy versions
1 parent 7eba7f1 commit 4e180f7

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

.github/workflows/test.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,27 @@ concurrency:
1616

1717
jobs:
1818
test:
19-
name: os=${{ matrix.os }}, py=${{ matrix.python-version }}, np=${{ matrix.numpy-version }}, deps=${{ matrix.dependency-set }}
19+
name: os=${{ matrix.os }}, py=${{ matrix.python-version }}, deps=${{ matrix.dependency-set }}
2020

2121
strategy:
2222
matrix:
2323
python-version: ['3.11', '3.12', '3.13']
24-
numpy-version: ['2.0', '2.2']
2524
dependency-set: ["minimal", "optional"]
2625
os: ["ubuntu-latest"]
2726
include:
2827
- python-version: '3.11'
29-
numpy-version: '2.0'
3028
dependency-set: 'optional'
3129
os: 'macos-latest'
30+
3231
- python-version: '3.13'
33-
numpy-version: '2.2'
3432
dependency-set: 'optional'
3533
os: 'macos-latest'
34+
3635
- python-version: '3.11'
37-
numpy-version: '2.0'
3836
dependency-set: 'optional'
3937
os: 'windows-latest'
38+
4039
- python-version: '3.13'
41-
numpy-version: '2.2'
4240
dependency-set: 'optional'
4341
os: 'windows-latest'
4442
runs-on: ${{ matrix.os }}
@@ -58,13 +56,13 @@ jobs:
5856
pip install hatch
5957
- name: Set Up Hatch Env
6058
run: |
61-
hatch env create test.py${{ matrix.python-version }}-${{ matrix.numpy-version }}-${{ matrix.dependency-set }}
62-
hatch env run -e test.py${{ matrix.python-version }}-${{ matrix.numpy-version }}-${{ matrix.dependency-set }} list-env
59+
hatch env create test.py${{ matrix.python-version }}-${{ matrix.dependency-set }}
60+
hatch env run -e test.py${{ matrix.python-version }}-${{ matrix.dependency-set }} list-env
6361
- name: Run Tests
6462
env:
6563
HYPOTHESIS_PROFILE: ci
6664
run: |
67-
hatch env run --env test.py${{ matrix.python-version }}-${{ matrix.numpy-version }}-${{ matrix.dependency-set }} run-coverage
65+
hatch env run --env test.py${{ matrix.python-version }}-${{ matrix.dependency-set }} run-coverage
6866
- name: Upload coverage
6967
if: ${{ matrix.dependency-set == 'optional' && matrix.os == 'ubuntu-latest' }}
7068
uses: codecov/codecov-action@v5
@@ -152,4 +150,4 @@ jobs:
152150
contains(needs.*.result, 'cancelled')
153151
run: exit 1
154152
- name: Success
155-
run: echo Success!
153+
run: echo Success!

pyproject.toml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,6 @@ version.source = "vcs"
152152
hooks.vcs.version-file = "src/zarr/_version.py"
153153

154154
[tool.hatch.envs.test]
155-
dependencies = [
156-
"numpy~={matrix:numpy}",
157-
]
158155
features = ["test"]
159156

160157
[tool.hatch.envs.test.env-vars]
@@ -165,7 +162,6 @@ COV_CORE_DATAFILE = ".coverage.eager"
165162

166163
[[tool.hatch.envs.test.matrix]]
167164
python = ["3.11", "3.12", "3.13"]
168-
numpy = ["2.0", "2.2"]
169165
deps = ["minimal", "optional"]
170166

171167
[tool.hatch.envs.test.overrides]
@@ -188,14 +184,12 @@ list-env = "pip list"
188184
[tool.hatch.envs.gputest]
189185
template = "test"
190186
dependencies = [
191-
"numpy~={matrix:numpy}",
192187
"universal_pathlib",
193188
]
194189
features = ["test", "gpu"]
195190

196191
[[tool.hatch.envs.gputest.matrix]]
197192
python = ["3.11", "3.12", "3.13"]
198-
numpy = ["2.0", "2.2"]
199193
version = ["minimal"]
200194

201195
[tool.hatch.envs.gputest.scripts]
@@ -457,4 +451,4 @@ start_string = "<!-- towncrier release notes start -->\n"
457451
ignore-words-list = "astroid"
458452

459453
[project.entry-points.pytest11]
460-
zarr = "zarr.testing"
454+
zarr = "zarr.testing"

0 commit comments

Comments
 (0)