Skip to content

Commit e59950d

Browse files
authored
chore/hollow out zarr3 (#780)
* Update pyproject.toml * test against zarr-with-numcodecs branch * weaken zarr dependency * warn when importing from numcodecs.zarr3 * update pre-commit * update importerror test * adjust exception text test * remove print statement * fix numpy dep, remove direct references in pyproject.toml * revert numpy dep changes * revert revert of dep changes for test env * drop hatch in favor of uv + parametrization in ci * fix substitution syntax * typo * zarr.codecs entrypoints * install crc32c with zarr * remove zarr installation from main ci * remove zarr from i386 workload
1 parent b543298 commit e59950d

File tree

7 files changed

+121
-721
lines changed

7 files changed

+121
-721
lines changed

.github/workflows/ci-i386.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,6 @@ jobs:
4646
uv pip install -v -e .[test,test_extras,msgpack,crc32c]
4747
shell: alpine.sh {0}
4848

49-
50-
- name: Install zarr-python
51-
# Since zarr v3 requires numpy >= 1.25, on Python 3.11 leave it out
52-
# so we can have some tests of our minimum version of numpy (1.24)
53-
if: matrix.python-version != '3.11'
54-
run: uv add zarr>=3
55-
shell: alpine.sh {0}
56-
57-
5849
- name: List installed packages
5950
run: uv pip list
6051
shell: alpine.sh {0}

.github/workflows/ci.yaml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@ jobs:
5252
export DISABLE_NUMCODECS_AVX2=""
5353
python -m pip install -v -e .[test,test_extras,msgpack,crc32c,pcodec,zfpy]
5454
55-
- name: Install zarr-python
56-
# Since zarr v3 requires numpy >= 1.25, on Python 3.11 leave it out
57-
# so we can have some tests of our minimum version of numpy (1.24)
58-
if: matrix.python-version != '3.11'
59-
run: python -m pip install zarr>=3
60-
6155
- name: List installed packages
6256
run: python -m pip list
6357

@@ -75,6 +69,8 @@ jobs:
7569
runs-on: ubuntu-latest
7670
strategy:
7771
fail-fast: false
72+
matrix:
73+
zarr-version: ["312", "313"]
7874

7975
defaults:
8076
run:
@@ -93,10 +89,10 @@ jobs:
9389
pixi-version: v0.49.0
9490
cache: false
9591

96-
- name: List deps
92+
- name: List installed packages
9793
shell: "bash -l {0}"
98-
run: pixi run -e default hatch run test:list-deps
94+
run: pixi run ls-deps-${{matrix.zarr-version}}
9995

100-
- name: Run tests
96+
- name: Run tests with Zarr ${{ matrix.zarr-version }}
10197
shell: "bash -l {0}"
102-
run: pixi run -e default hatch run test:test-zarr
98+
run: pixi run test-zarr-${{ matrix.zarr-version }}

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ repos:
3030
hooks:
3131
- id: mypy
3232
args: [--config-file, pyproject.toml]
33-
additional_dependencies: [numpy, pytest, crc32c, zfpy, 'zarr>=3']
33+
additional_dependencies: [numpy, pytest, crc32c, zfpy, 'zarr>=3.1.3']

0 commit comments

Comments
 (0)