mypy

Author: normanrz

tests/test_api.py

@@ -23,7 +23,7 @@
     save_array,
     save_group,
 )
-from zarr.core.common import MemoryOrder, ZarrFormat
+from zarr.core.common import JSON, MemoryOrder, ZarrFormat
 from zarr.errors import MetadataValidationError
 from zarr.storage._utils import normalize_path
 from zarr.storage.memory import MemoryStore
@@ -61,7 +61,7 @@ def test_create(memory_store: Store) -> None:
 # TODO: parametrize over everything this function takes
 @pytest.mark.parametrize("store", ["memory"], indirect=True)
 def test_create_array(store: Store) -> None:
-    attrs = {"foo": 100}
+    attrs: dict[str, JSON] = {"foo": 100}  # explicit type annotation to avoid mypy error
     shape = (10, 10)
     path = "foo"
     data_val = 1

tests/test_array.py

@@ -4,7 +4,7 @@
 import pickle
 import re
 from itertools import accumulate
-from typing import Any, Literal
+from typing import TYPE_CHECKING, Any, Literal
 
 import numcodecs
 import numpy as np
@@ -43,6 +43,9 @@
 from zarr.storage import LocalStore, MemoryStore
 from zarr.storage.common import StorePath
 
+if TYPE_CHECKING:
+    from zarr.core.array_spec import ArrayConfigParams
+
 
 @pytest.mark.parametrize("store", ["local", "memory", "zip"], indirect=["store"])
 @pytest.mark.parametrize("zarr_format", [2, 3])
@@ -421,16 +424,16 @@ async def test_nbytes_stored_async() -> None:
 
 
 def test_default_fill_values() -> None:
-    a = zarr.create_array(MemoryStore(), shape=5, chunks=5, dtype="<U4")
+    a = zarr.Array.create(MemoryStore(), shape=5, chunk_shape=5, dtype="<U4")
     assert a.fill_value == ""
 
-    b = zarr.create_array(MemoryStore(), shape=5, chunks=5, dtype="<S4")
+    b = zarr.Array.create(MemoryStore(), shape=5, chunk_shape=5, dtype="<S4")
     assert b.fill_value == b""
 
-    c = zarr.create_array(MemoryStore(), shape=5, chunks=5, dtype="i")
+    c = zarr.Array.create(MemoryStore(), shape=5, chunk_shape=5, dtype="i")
     assert c.fill_value == 0
 
-    d = zarr.create_array(MemoryStore(), shape=5, chunks=5, dtype="f")
+    d = zarr.Array.create(MemoryStore(), shape=5, chunk_shape=5, dtype="f")
     assert d.fill_value == 0.0
 
 
@@ -458,15 +461,17 @@ def test_vlen_errors() -> None:
         match="For string dtype, ArrayBytesCodec must be `VLenUTF8Codec`, got `BytesCodec`.",
     ):
         zarr.create_array(
-            MemoryStore(), shape=5, chunks=5, dtype="<U4", array_bytes_codec=BytesCodec()
+            MemoryStore(), shape=(5,), chunks=(5,), dtype="<U4", array_bytes_codec=BytesCodec()
         )
 
 
 @pytest.mark.parametrize("zarr_format", [2, 3])
-def test_update_attrs(zarr_format: int) -> None:
+def test_update_attrs(zarr_format: Literal[2, 3]) -> None:
     # regression test for https://github.com/zarr-developers/zarr-python/issues/2328
     store = MemoryStore()
-    arr = zarr.create_array(store=store, shape=5, chunks=5, dtype="f8", zarr_format=zarr_format)
+    arr = zarr.create_array(
+        store=store, shape=(5,), chunks=(5,), dtype="f8", zarr_format=zarr_format
+    )
     arr.attrs["foo"] = "bar"
     assert arr.attrs["foo"] == "bar"
 
@@ -794,13 +799,14 @@ def test_array_create_metadata_order_v2(
 @pytest.mark.parametrize("store", ["memory"], indirect=True)
 def test_array_create_order(
     order_config: MemoryOrder | None,
-    zarr_format: int,
+    zarr_format: Literal[2, 3],
     store: MemoryStore,
 ) -> None:
     """
     Test that the arrays generated by array indexing have a memory order defined by the config order
     value
     """
+    config: ArrayConfigParams = {}
     if order_config is None:
         config = {}
         expected = zarr.config.get("array.order")
@@ -963,16 +969,16 @@ def test_chunks_and_shards() -> None:
 
 
 def test_create_array_default_fill_values() -> None:
-    a = zarr.create_array(MemoryStore(), shape=5, chunks=5, dtype="<U4")
+    a = zarr.create_array(MemoryStore(), shape=(5,), chunks=(5,), dtype="<U4")
     assert a.fill_value == ""
 
-    b = zarr.create_array(MemoryStore(), shape=5, chunks=5, dtype="<S4")
+    b = zarr.create_array(MemoryStore(), shape=(5,), chunks=(5,), dtype="<S4")
     assert b.fill_value == b""
 
-    c = zarr.create_array(MemoryStore(), shape=5, chunks=5, dtype="i")
+    c = zarr.create_array(MemoryStore(), shape=(5,), chunks=(5,), dtype="i")
     assert c.fill_value == 0
 
-    d = zarr.create_array(MemoryStore(), shape=5, chunks=5, dtype="f")
+    d = zarr.create_array(MemoryStore(), shape=(5,), chunks=(5,), dtype="f")
     assert d.fill_value == 0.0
 
 

tests/test_codecs/test_sharding.py

@@ -407,7 +407,7 @@ async def test_sharding_with_chunks_per_shard(
     store: Store, index_location: ShardingCodecIndexLocation, chunks_per_shard: tuple[int]
 ) -> None:
     chunk_shape = (2, 1)
-    shape = [x * y for x, y in zip(chunks_per_shard, chunk_shape, strict=False)]
+    shape = tuple(x * y for x, y in zip(chunks_per_shard, chunk_shape, strict=False))
     data = np.ones(np.prod(shape), dtype="int32").reshape(shape)
     fill_value = 42