Skip to content

Commit 5a956a9

Browse files
committed
no zarr2 + make zarr3 a public module
1 parent 0ad1fdf commit 5a956a9

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
python-version: ["3.10", "3.11", "3.12", "3.13.0"]
1616
# macos-12 is an intel runner, macos-14 is a arm64 runner
1717
platform: [ubuntu-latest, windows-latest, macos-12, macos-14]
18-
zarr-version: ["zarr>=2,<3", "zarr==3.0.0b0"]
1918

2019
steps:
2120
- name: Checkout source
@@ -77,7 +76,7 @@ jobs:
7776
shell: "bash -l {0}"
7877
run: |
7978
conda activate env
80-
python -m pip install '${{ matrix.zarr-version }}'
79+
python -m pip install 'zarr==3.0.0b0'
8180
8281
# This is used to test with zfpy, which does not yet support numpy 2.0
8382
- name: Install older numpy and zfpy

numcodecs/tests/test_zarr3.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
from __future__ import annotations
2-
from collections.abc import Iterator
3-
42

53
import numpy as np
64
import pytest
75

86
from numcodecs.registry import get_codec
97

10-
118
zarr = pytest.importorskip("zarr", minversion="3.0.0")
129

1310
get_codec_class = zarr.codecs.registry.get_codec_class
@@ -23,8 +20,8 @@
2320

2421

2522
@pytest.fixture
26-
def store() -> Iterator[Store]:
27-
yield StorePath(MemoryStore(mode="w"))
23+
def store() -> Store:
24+
return StorePath(MemoryStore(mode="w"))
2825

2926

3027
@pytest.mark.parametrize(

numcodecs/tests/test_zarr3_import.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ def test_zarr3_import():
77
ERROR_MESSAGE_MATCH = "zarr 3.0.0 or later.*"
88

99
try:
10-
import zarr
11-
12-
if zarr.__version__ < "3.0.0":
13-
with pytest.raises(ImportError, match=ERROR_MESSAGE_MATCH):
14-
import numcodecs._zarr3 # noqa: F401
10+
import zarr # noqa: F401
1511
except ImportError:
1612
with pytest.raises(ImportError, match=ERROR_MESSAGE_MATCH):
17-
import numcodecs._zarr3 # noqa: F401
13+
import numcodecs.zarr3 # noqa: F401
File renamed without changes.

0 commit comments

Comments
 (0)