Skip to content

Commit 381a264

Browse files
committed
fix tests
1 parent e14279d commit 381a264

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/zarr/core/metadata/v2.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,12 @@ def from_dict(cls, data: dict[str, Any]) -> ArrayV2Metadata:
158158
def to_dict(self) -> dict[str, JSON]:
159159
zarray_dict = super().to_dict()
160160
if isinstance(zarray_dict["compressor"], numcodecs.abc.Codec):
161-
zarray_dict["compressor"] = zarray_dict["compressor"].get_config()
161+
codec_config = zarray_dict["compressor"].get_config()
162+
# Hotfix for https://github.com/zarr-developers/zarr-python/issues/2647
163+
if codec_config["id"] == "zstd" and not codec_config.get("checksum", False):
164+
codec_config.pop("checksum")
165+
zarray_dict["compressor"] = codec_config
166+
162167
if zarray_dict["filters"] is not None:
163168
raw_filters = zarray_dict["filters"]
164169
new_filters = []

tests/test_metadata/test_dtype.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def test_dict_serialization(wrapper_cls: DTYPE) -> None:
116116
(Complex64(), np.complex64(0)),
117117
(Complex128(), np.complex128(0)),
118118
(FixedLengthAsciiString(length=3), np.bytes_(b"")),
119-
(StaticRawBytes(length=3), np.void(b"")),
119+
(StaticRawBytes(length=3), np.void(b"\x00\x00\x00")),
120120
(FixedLengthUnicodeString(length=3), np.str_("")),
121121
(
122122
Structured(fields=(("a", Float64(), 0), ("b", Int8(), 8))),

tests/test_metadata/test_v2.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
from zarr.abc.codec import Codec
2121

22-
import numcodecs
23-
2422

2523
def test_parse_zarr_format_valid() -> None:
2624
assert parse_zarr_format(2) == 2
@@ -33,8 +31,8 @@ def test_parse_zarr_format_invalid(data: Any) -> None:
3331

3432

3533
@pytest.mark.parametrize("attributes", [None, {"foo": "bar"}])
36-
@pytest.mark.parametrize("filters", [None, (numcodecs.GZip(),)])
37-
@pytest.mark.parametrize("compressor", [None, numcodecs.GZip()])
34+
@pytest.mark.parametrize("filters", [None, [{"id": "gzip", "level": 1}]])
35+
@pytest.mark.parametrize("compressor", [None, {"id": "gzip", "level": 1}])
3836
@pytest.mark.parametrize("fill_value", [None, 0, 1])
3937
@pytest.mark.parametrize("order", ["C", "F"])
4038
@pytest.mark.parametrize("dimension_separator", [".", "/", None])

0 commit comments

Comments
 (0)