Skip to content

Commit 8cfce5b

Browse files
committed
fixes?
1 parent aa3f708 commit 8cfce5b

File tree

3 files changed

+31
-26
lines changed

3 files changed

+31
-26
lines changed

numcodecs/tests/test_zarr3.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@
55

66
from numcodecs.registry import get_codec
77

8-
zarr = pytest.importorskip("zarr", minversion="3.0.0")
8+
zarr = pytest.importorskip("zarr")
99

10-
get_codec_class = zarr.codecs.registry.get_codec_class
11-
Array = zarr.array.Array
12-
JSON = zarr.common.JSON
10+
pytestmark = pytest.mark.skipif(
11+
zarr.__version__ < "3.0.0", reason="zarr 3.0.0 or later is required"
12+
)
13+
14+
get_codec_class = zarr.registry.get_codec_class
15+
Array = zarr.Array
16+
JSON = zarr.core.common.JSON
1317
BytesCodec = zarr.codecs.BytesCodec
1418
Store = zarr.abc.store.Store
15-
MemoryStore = zarr.store.MemoryStore
16-
StorePath = zarr.store.StorePath
19+
MemoryStore = zarr.storage.MemoryStore
20+
StorePath = zarr.storage.StorePath
1721

1822

1923
EXPECTED_WARNING_STR = "Numcodecs codecs are not in the Zarr version 3.*"

numcodecs/zarr3.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ def __init__(self, *, codec_id: str | None = None, codec_config: dict[str, JSON]
5959
raise ValueError(f"Codec id does not match {codec_id}. Got: {codec_config['id']}.")
6060

6161
object.__setattr__(self, "codec_config", codec_config)
62+
print("HELLO")
6263
warn(
6364
"Numcodecs codecs are not in the Zarr version 3 specification and "
6465
"may not be supported by other zarr implementations.",

pyproject.toml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -73,26 +73,26 @@ pcodec = [
7373
]
7474

7575
[project.entry-points."zarr.codecs"]
76-
"numcodecs.blosc" = "numcodecs._zarr3:BloscCodec"
77-
"numcodecs.lz4" = "numcodecs._zarr3:Lz4Codec"
78-
"numcodecs.zstd" = "numcodecs._zarr3:ZstdCodec"
79-
"numcodecs.zlib" = "numcodecs._zarr3:ZlibCodec"
80-
"numcodecs.gzip" = "numcodecs._zarr3:GzipCodec"
81-
"numcodecs.bz2" = "numcodecs._zarr3:Bz2Codec"
82-
"numcodecs.lzma" = "numcodecs._zarr3:LzmaCodec"
83-
"numcodecs.shuffle" = "numcodecs._zarr3:ShuffleCodec"
84-
"numcodecs.delta" = "numcodecs._zarr3:DeltaCodec"
85-
"numcodecs.bitround" = "numcodecs._zarr3:BitroundCodec"
86-
"numcodecs.fixedscaleoffset" = "numcodecs._zarr3:FixedScaleOffsetCodec"
87-
"numcodecs.quantize" = "numcodecs._zarr3:QuantizeCodec"
88-
"numcodecs.packbits" = "numcodecs._zarr3:PackbitsCodec"
89-
"numcodecs.astype" = "numcodecs._zarr3:AsTypeCodec"
90-
"numcodecs.crc32" = "numcodecs._zarr3:Crc32Codec"
91-
"numcodecs.adler32" = "numcodecs._zarr3:Adler32Codec"
92-
"numcodecs.fletcher32" = "numcodecs._zarr3:Fletcher32Codec"
93-
"numcodecs.jenkins_lookup3" = "numcodecs._zarr3:JenkinsLookup3Codec"
94-
"numcodecs.pcodec" = "numcodecs._zarr3:PCodecCodec"
95-
"numcodecs.zfpy" = "numcodecs._zarr3:ZFPYCodec"
76+
"numcodecs.blosc" = "numcodecs.zarr3:BloscCodec"
77+
"numcodecs.lz4" = "numcodecs.zarr3:Lz4Codec"
78+
"numcodecs.zstd" = "numcodecs.zarr3:ZstdCodec"
79+
"numcodecs.zlib" = "numcodecs.zarr3:ZlibCodec"
80+
"numcodecs.gzip" = "numcodecs.zarr3:GzipCodec"
81+
"numcodecs.bz2" = "numcodecs.zarr3:Bz2Codec"
82+
"numcodecs.lzma" = "numcodecs.zarr3:LzmaCodec"
83+
"numcodecs.shuffle" = "numcodecs.zarr3:ShuffleCodec"
84+
"numcodecs.delta" = "numcodecs.zarr3:DeltaCodec"
85+
"numcodecs.bitround" = "numcodecs.zarr3:BitroundCodec"
86+
"numcodecs.fixedscaleoffset" = "numcodecs.zarr3:FixedScaleOffsetCodec"
87+
"numcodecs.quantize" = "numcodecs.zarr3:QuantizeCodec"
88+
"numcodecs.packbits" = "numcodecs.zarr3:PackbitsCodec"
89+
"numcodecs.astype" = "numcodecs.zarr3:AsTypeCodec"
90+
"numcodecs.crc32" = "numcodecs.zarr3:Crc32Codec"
91+
"numcodecs.adler32" = "numcodecs.zarr3:Adler32Codec"
92+
"numcodecs.fletcher32" = "numcodecs.zarr3:Fletcher32Codec"
93+
"numcodecs.jenkins_lookup3" = "numcodecs.zarr3:JenkinsLookup3Codec"
94+
"numcodecs.pcodec" = "numcodecs.zarr3:PCodecCodec"
95+
"numcodecs.zfpy" = "numcodecs.zarr3:ZFPYCodec"
9696

9797
[tool.setuptools]
9898
license-files = ["LICENSE.txt"]

0 commit comments

Comments
 (0)