np.dtype[np.generic] -> np.dtype[Any]

Author: d-v-b

src/zarr/codecs/sharding.py

@@ -396,9 +396,7 @@ def evolve_from_array_spec(self, array_spec: ArraySpec) -> Self:
             return replace(self, codecs=evolved_codecs)
         return self
 
-    def validate(
-        self, *, shape: ChunkCoords, dtype: np.dtype[np.generic], chunk_grid: ChunkGrid
-    ) -> None:
+    def validate(self, *, shape: ChunkCoords, dtype: np.dtype[Any], chunk_grid: ChunkGrid) -> None:
         if len(self.chunk_shape) != len(shape):
             raise ValueError(
                 "The shard's `chunk_shape` and array's `shape` need to have the same number of dimensions."

src/zarr/core/array.py

@@ -3686,7 +3686,7 @@ def _get_default_encoding_v3(
 
 
 def _get_default_chunk_encoding_v2(
-    dtype: np.dtype[np.generic],
+    dtype: np.dtype[Any],
 ) -> tuple[tuple[numcodecs.abc.Codec, ...], numcodecs.abc.Codec]:
     """
     Get the default chunk encoding for zarr v2 arrays, given a dtype
@@ -3718,7 +3718,7 @@ def _parse_chunk_encoding_v2(
     *,
     compression: numcodecs.abc.Codec | Literal["auto"],
     filters: tuple[numcodecs.abc.Codec, ...] | Literal["auto"],
-    dtype: np.dtype[np.generic],
+    dtype: np.dtype[Any],
 ) -> tuple[tuple[numcodecs.abc.Codec, ...], numcodecs.abc.Codec]:
     """
     Generate chunk encoding classes for v2 arrays with optional defaults.
@@ -3740,7 +3740,7 @@ def _parse_chunk_encoding_v3(
     *,
     compression: Iterable[BytesBytesCodec] | Literal["auto"],
     filters: Iterable[ArrayArrayCodec] | Literal["auto"],
-    dtype: np.dtype[np.generic],
+    dtype: np.dtype[Any],
 ) -> tuple[tuple[ArrayArrayCodec, ...], ArrayBytesCodec, tuple[BytesBytesCodec, ...]]:
     """
     Generate chunk encoding classes for v3 arrays with optional defaults.

src/zarr/core/chunk_grids.py

@@ -200,7 +200,7 @@ def _auto_partition(
     array_shape: tuple[int, ...],
     shard_shape: tuple[int, ...] | Literal["auto"] | None,
     chunk_shape: tuple[int, ...] | Literal["auto"],
-    dtype: np.dtype[np.generic],
+    dtype: np.dtype[Any],
 ) -> tuple[tuple[int, ...] | None, tuple[int, ...]]:
     """
     Automatically determine the shard shape and chunk shape for an array, given the shape and dtype of the array.

src/zarr/core/common.py

@@ -168,7 +168,7 @@ def parse_bool(data: Any) -> bool:
     raise ValueError(f"Expected bool, got {data} instead.")
 
 
-def parse_dtype(dtype: Any, zarr_format: ZarrFormat) -> np.dtype[np.generic]:
+def parse_dtype(dtype: Any, zarr_format: ZarrFormat) -> np.dtype[Any]:
     if dtype is str or dtype == "str":
         if zarr_format == 2:
             # special case as object

src/zarr/core/metadata/v3.py

@@ -449,7 +449,7 @@ def parse_fill_value(
         return np.bytes_(fill_value)
 
     # the rest are numeric types
-    np_dtype = cast(np.dtype[np.generic], data_type.to_numpy())
+    np_dtype = cast(np.dtype[Any], data_type.to_numpy())
 
     if isinstance(fill_value, Sequence) and not isinstance(fill_value, str):
         if data_type in (DataType.complex64, DataType.complex128):
@@ -513,7 +513,7 @@ def default_fill_value(dtype: DataType) -> str | bytes | np.generic:
         return b""
     else:
         np_dtype = dtype.to_numpy()
-        np_dtype = cast(np.dtype[np.generic], np_dtype)
+        np_dtype = cast(np.dtype[Any], np_dtype)
         return np_dtype.type(0)
 
 
@@ -586,7 +586,7 @@ def to_numpy_shortname(self) -> str:
         }
         return data_type_to_numpy[self]
 
-    def to_numpy(self) -> np.dtypes.StringDType | np.dtypes.ObjectDType | np.dtype[np.generic]:
+    def to_numpy(self) -> np.dtypes.StringDType | np.dtypes.ObjectDType | np.dtype[Any]:
         # note: it is not possible to round trip DataType <-> np.dtype
         # due to the fact that DataType.string and DataType.bytes both
         # generally return np.dtype("O") from this function, even though