fix some tests

Author: normanrz

src/zarr/core/array.py

@@ -3748,16 +3748,22 @@ def _get_default_encoding_v3(
 
 def _get_default_chunk_encoding_v2(
     dtype: np.dtype[Any],
-) -> tuple[tuple[numcodecs.abc.Codec, ...], numcodecs.abc.Codec | None]:
+) -> tuple[tuple[numcodecs.abc.Codec, ...] | None, numcodecs.abc.Codec | None]:
     """
     Get the default chunk encoding for zarr v2 arrays, given a dtype
     """
 
     compressor_dict = _default_compressor(dtype)
     filter_dicts = _default_filters(dtype)
 
-    compressor = numcodecs.get_codec(compressor_dict)
-    filters = tuple(numcodecs.get_codec(f) for f in filter_dicts)
+    compressor = None
+    if compressor_dict is not None:
+        compressor = numcodecs.get_codec(compressor_dict)
+
+    filters = None
+    if filter_dicts is not None:
+        filters = tuple(numcodecs.get_codec(f) for f in filter_dicts)
+
     return filters, compressor
 
 
@@ -3766,7 +3772,7 @@ def _parse_chunk_encoding_v2(
     compression: numcodecs.abc.Codec | Literal["auto"],
     filters: tuple[numcodecs.abc.Codec, ...] | Literal["auto"],
     dtype: np.dtype[Any],
-) -> tuple[tuple[numcodecs.abc.Codec, ...], numcodecs.abc.Codec]:
+) -> tuple[tuple[numcodecs.abc.Codec, ...] | None, numcodecs.abc.Codec | None]:
     """
     Generate chunk encoding classes for v2 arrays with optional defaults.
     """

src/zarr/core/config.py

@@ -67,27 +67,27 @@ def reset(self) -> None:
                 "order": "C",
                 "write_empty_chunks": False,
                 "v2_default_compressor": {
-                    "numeric": {"id": "zstd", "level": 0, "checksum": True},
-                    "string": {"id": "zstd", "level": 0, "checksum": True},
-                    "bytes": {"id": "zstd", "level": 0, "checksum": True},
+                    "numeric": {"id": "zstd", "level": 0, "checksum": False},
+                    "string": {"id": "zstd", "level": 0, "checksum": False},
+                    "bytes": {"id": "zstd", "level": 0, "checksum": False},
                 },
                 "v2_default_filters": {
-                    "numeric": [],
+                    "numeric": None,
                     "string": [{"id": "vlen-utf8"}],
                     "bytes": [{"id": "vlen-bytes"}],
                 },
                 "v3_default_codecs": {
                     "numeric": [
                         {"name": "bytes", "configuration": {"endian": "little"}},
-                        {"name": "zstd", "configuration": {"level": 0, "checksum": True}},
+                        {"name": "zstd", "configuration": {"level": 0, "checksum": False}},
                     ],
                     "string": [
                         {"name": "vlen-utf8"},
-                        {"name": "zstd", "configuration": {"level": 0, "checksum": True}},
+                        {"name": "zstd", "configuration": {"level": 0, "checksum": False}},
                     ],
                     "bytes": [
                         {"name": "vlen-bytes"},
-                        {"name": "zstd", "configuration": {"level": 0, "checksum": True}},
+                        {"name": "zstd", "configuration": {"level": 0, "checksum": False}},
                     ],
                 },
             },

src/zarr/core/metadata/v2.py

@@ -357,7 +357,7 @@ def _default_compressor(
 
 def _default_filters(
     dtype: np.dtype[Any],
-) -> list[dict[str, JSON]]:
+) -> list[dict[str, JSON]] | None:
     """Get the default filters and compressor for a dtype.
 
     https://numpy.org/doc/2.1/reference/generated/numpy.dtype.kind.html
@@ -372,4 +372,4 @@ def _default_filters(
     else:
         raise ValueError(f"Unsupported dtype kind {dtype.kind}")
 
-    return default_filters.get(dtype_key, [])
+    return default_filters.get(dtype_key, None)

src/zarr/testing/strategies.py

@@ -143,7 +143,7 @@ def arrays(
     a = root.create_array(
         array_path,
         shape=nparray.shape,
-        chunk_shape=chunks,
+        chunks=chunks,
         dtype=nparray.dtype,
         attributes=attributes,
         # compressor=compressor,  # FIXME

tests/test_api.py

@@ -68,7 +68,7 @@ def test_create_array(store: Store) -> None:
     path = "foo"
     data_val = 1
     array_w = create_array(
-        store, name=path, shape=shape, attributes=attrs, chunk_shape=shape, dtype="uint8"
+        store, name=path, shape=shape, attributes=attrs, chunks=shape, dtype="uint8"
     )
     array_w[:] = data_val
     assert array_w.shape == shape

tests/test_array.py

@@ -8,7 +8,6 @@
 import numcodecs
 import numpy as np
 import pytest
-from numcodecs import Zstd
 
 import zarr.api.asynchronous
 from zarr import Array, AsyncArray, Group
@@ -138,13 +137,13 @@ def test_array_name_properties_with_group(
     store: LocalStore | MemoryStore, zarr_format: ZarrFormat
 ) -> None:
     root = Group.from_store(store=store, zarr_format=zarr_format)
-    foo = root.create_array("foo", shape=(100,), chunk_shape=(10,), dtype="i4")
+    foo = root.create_array("foo", shape=(100,), chunks=(10,), dtype="i4")
     assert foo.path == "foo"
     assert foo.name == "/foo"
     assert foo.basename == "foo"
 
     bar = root.create_group("bar")
-    spam = bar.create_array("spam", shape=(100,), chunk_shape=(10,), dtype="i4")
+    spam = bar.create_array("spam", shape=(100,), chunks=(10,), dtype="i4")
 
     assert spam.path == "bar/spam"
     assert spam.name == "/bar/spam"
@@ -463,7 +462,7 @@ def test_info_v2(self) -> None:
             _read_only=False,
             _store_type="MemoryStore",
             _count_bytes=128,
-            _filters=(numcodecs.Zstd(),),
+            _compressor=numcodecs.Zstd(),
         )
         assert result == expected
 
@@ -519,8 +518,8 @@ async def test_info_v2_async(self) -> None:
             _order="C",
             _read_only=False,
             _store_type="MemoryStore",
-            _filters=(Zstd(level=0),),
             _count_bytes=128,
+            _compressor=numcodecs.Zstd(),
         )
         assert result == expected
 
@@ -925,7 +924,7 @@ def test_auto_partition_auto_shards(
             expected_shards += (cs,)
 
     auto_shards, _ = _auto_partition(
-        array_shape=array_shape, chunks=chunk_shape, shards="auto", dtype=dtype
+        array_shape=array_shape, chunk_shape=chunk_shape, shard_shape="auto", dtype=dtype
     )
     assert auto_shards == expected_shards
 

tests/test_config.py

@@ -54,27 +54,27 @@ def test_config_defaults_set() -> None:
                 "order": "C",
                 "write_empty_chunks": False,
                 "v2_default_compressor": {
-                    "numeric": {"id": "zstd", "level": 0, "checksum": True},
-                    "string": {"id": "zstd", "level": 0, "checksum": True},
-                    "bytes": {"id": "zstd", "level": 0, "checksum": True},
+                    "numeric": {"id": "zstd", "level": 0, "checksum": False},
+                    "string": {"id": "zstd", "level": 0, "checksum": False},
+                    "bytes": {"id": "zstd", "level": 0, "checksum": False},
                 },
                 "v2_default_filters": {
-                    "numeric": [],
+                    "numeric": None,
                     "string": [{"id": "vlen-utf8"}],
                     "bytes": [{"id": "vlen-bytes"}],
                 },
                 "v3_default_codecs": {
                     "bytes": [
                         {"name": "vlen-bytes"},
-                        {"name": "zstd", "configuration": {"level": 0, "checksum": True}},
+                        {"name": "zstd", "configuration": {"level": 0, "checksum": False}},
                     ],
                     "numeric": [
                         {"name": "bytes", "configuration": {"endian": "little"}},
-                        {"name": "zstd", "configuration": {"level": 0, "checksum": True}},
+                        {"name": "zstd", "configuration": {"level": 0, "checksum": False}},
                     ],
                     "string": [
                         {"name": "vlen-utf8"},
-                        {"name": "zstd", "configuration": {"level": 0, "checksum": True}},
+                        {"name": "zstd", "configuration": {"level": 0, "checksum": False}},
                     ],
                 },
             },

tests/test_group.py

@@ -155,7 +155,7 @@ def test_group_members(store: Store, zarr_format: ZarrFormat, consolidated_metad
     subsubsubgroup = subsubgroup.create_group("subsubsubgroup")
 
     members_expected["subarray"] = group.create_array(
-        "subarray", shape=(100,), dtype="uint8", chunk_shape=(10,), overwrite=True
+        "subarray", shape=(100,), dtype="uint8", chunks=(10,), overwrite=True
     )
     # add an extra object to the domain of the group.
     # the list of children should ignore this object.
@@ -226,9 +226,7 @@ def test_group(store: Store, zarr_format: ZarrFormat) -> None:
 
     # create an array from the "bar" group
     data = np.arange(0, 4 * 4, dtype="uint16").reshape((4, 4))
-    arr = bar.create_array(
-        "baz", shape=data.shape, dtype=data.dtype, chunk_shape=(2, 2), overwrite=True
-    )
+    arr = bar.create_array("baz", shape=data.shape, dtype=data.dtype, chunks=(2, 2), overwrite=True)
     arr[:] = data
 
     # check the array
@@ -312,10 +310,8 @@ def test_group_getitem(store: Store, zarr_format: ZarrFormat, consolidated: bool
 
     group = Group.from_store(store, zarr_format=zarr_format)
     subgroup = group.create_group(name="subgroup")
-    subarray = group.create_array(name="subarray", shape=(10,), chunk_shape=(10,), dtype="uint8")
-    subsubarray = subgroup.create_array(
-        name="subarray", shape=(10,), chunk_shape=(10,), dtype="uint8"
-    )
+    subarray = group.create_array(name="subarray", shape=(10,), chunks=(10,), dtype="uint8")
+    subsubarray = subgroup.create_array(name="subarray", shape=(10,), chunks=(10,), dtype="uint8")
 
     if consolidated:
         group = zarr.api.synchronous.consolidate_metadata(store=store, zarr_format=zarr_format)
@@ -392,7 +388,7 @@ def test_group_delitem(store: Store, zarr_format: ZarrFormat, consolidated: bool
 
     group = Group.from_store(store, zarr_format=zarr_format)
     subgroup = group.create_group(name="subgroup")
-    subarray = group.create_array(name="subarray", shape=(10,), chunk_shape=(10,), dtype="uint8")
+    subarray = group.create_array(name="subarray", shape=(10,), chunks=(10,), dtype="uint8")
 
     if consolidated:
         group = zarr.api.synchronous.consolidate_metadata(store=store, zarr_format=zarr_format)
@@ -500,7 +496,7 @@ def test_group_child_iterators(store: Store, zarr_format: ZarrFormat, consolidat
                     "shape": (1,),
                     "chunks": (1,),
                     "order": "C",
-                    "filters": (),
+                    "filters": None,
                     "compressor": Zstd(level=0),
                     "zarr_format": zarr_format,
                 },

tests/test_metadata/test_consolidated.py

@@ -77,7 +77,7 @@ async def test_consolidated(self, memory_store_with_hierarchy: Store) -> None:
             },
             "codecs": (
                 {"configuration": {"endian": "little"}, "name": "bytes"},
-                {"configuration": {}, "name": "zstd"},
+                {"configuration": {"level": 0, "checksum": False}, "name": "zstd"},
             ),
             "data_type": "uint8",
             "fill_value": 0,
@@ -225,7 +225,7 @@ def test_consolidated_sync(self, memory_store):
             },
             "codecs": (
                 {"configuration": {"endian": "little"}, "name": "bytes"},
-                {"configuration": {}, "name": "zstd"},
+                {"configuration": {"level": 0, "checksum": False}, "name": "zstd"},
             ),
             "data_type": dtype,
             "fill_value": 0,
@@ -498,7 +498,7 @@ async def test_consolidated_metadata_v2(self):
                         attributes={"key": "a"},
                         chunks=(1,),
                         fill_value=0,
-                        filters=(Zstd(level=0),),
+                        compressor=Zstd(level=0),
                         order="C",
                     ),
                     "g1": GroupMetadata(

tests/test_store/test_zip.py

@@ -69,7 +69,7 @@ def test_api_integration(self, store: ZipStore) -> None:
 
         data = np.arange(10000, dtype=np.uint16).reshape(100, 100)
         z = root.create_array(
-            shape=data.shape, chunk_shape=(10, 10), name="foo", dtype=np.uint16, fill_value=99
+            shape=data.shape, chunks=(10, 10), name="foo", dtype=np.uint16, fill_value=99
         )
         z[:] = data