Merge remote-tracking branch 'upstream/v3' into user/tom/fix/v2-compat

src/zarr/codecs/crc32c_.py

@@ -38,6 +38,7 @@ async def _decode_single(
         crc32_bytes = data[-4:]
         inner_bytes = data[:-4]
 
+        # Need to do a manual cast until https://github.com/numpy/numpy/issues/26783 is resolved
         computed_checksum = np.uint32(crc32c(cast(typing_extensions.Buffer, inner_bytes))).tobytes()
         stored_checksum = bytes(crc32_bytes)
         if computed_checksum != stored_checksum:

src/zarr/codecs/sharding.py

@@ -101,7 +101,7 @@ class _ShardIndex(NamedTuple):
 
     @property
     def chunks_per_shard(self) -> ChunkCoords:
-        result = tuple(self.offsets_and_lengths[:-1])
+        result = tuple(self.offsets_and_lengths.shape[0:-1])
         # The cast is required until https://github.com/numpy/numpy/pull/27211 is merged
         return cast(ChunkCoords, result)
 

src/zarr/core/group.py

@@ -333,7 +333,7 @@ async def create_group(
     ) -> AsyncGroup:
         attributes = attributes or {}
         return await type(self).from_store(
-            self.store_path / path,
+            self.store_path / name,
             attributes=attributes,
             exists_ok=exists_ok,
             zarr_format=self.metadata.zarr_format,

src/zarr/core/metadata.py

@@ -606,10 +606,14 @@ def parse_fill_value_v3(fill_value: Any, dtype: COMPLEX_DTYPE) -> COMPLEX: ...
 
 
 @overload
-def parse_fill_value_v3(fill_value: Any, dtype: Any) -> Any:
-    # We'd like to remove this overload, but are currently unable to.
-    # `dtype` has gone through `parse_dtype`, which at the moment return
-    # np.dtype[Any].
+def parse_fill_value_v3(fill_value: Any, dtype: np.dtype[Any]) -> Any:
+    # This dtype[Any] is unfortunately necessary right now.
+    # See https://github.com/zarr-developers/zarr-python/issues/2131#issuecomment-2318010899
+    # for more details, but `dtype` here (which comes from `parse_dtype`)
+    # is np.dtype[Any].
+    #
+    # If you want the specialized types rather than Any, you need to use `np.dtypes.<dtype>`
+    # rather than np.dtypes(<type>)
     ...
 
 

tests/v3/test_group.py

@@ -583,7 +583,7 @@ async def test_asyncgroup_getitem(store: LocalStore | MemoryStore, zarr_format:
 
 async def test_asyncgroup_delitem(store: LocalStore | MemoryStore, zarr_format: ZarrFormat) -> None:
     agroup = await AsyncGroup.from_store(store=store, zarr_format=zarr_format)
-    sub_array_path = "sub_array"
+    array_name = "sub_array"
     _ = await agroup.create_array(
         name=array_name, shape=(10,), dtype="uint8", chunk_shape=(2,), attributes={"foo": 100}
     )