remove Any types

Author: d-v-b

src/zarr/core/_info.py

@@ -2,14 +2,14 @@
 
 import dataclasses
 import textwrap
-from typing import TYPE_CHECKING, Any, Literal
+from typing import TYPE_CHECKING, Literal
 
 if TYPE_CHECKING:
     import numcodecs.abc
 
     from zarr.abc.codec import ArrayArrayCodec, ArrayBytesCodec, BytesBytesCodec
     from zarr.core.common import ZarrFormat
-    from zarr.core.dtype.wrapper import ZDType
+    from zarr.core.dtype.wrapper import ZDType, _BaseDType, _BaseScalar
 
 
 @dataclasses.dataclass(kw_only=True)
@@ -80,7 +80,7 @@ class ArrayInfo:
 
     _type: Literal["Array"] = "Array"
     _zarr_format: ZarrFormat
-    _data_type: ZDType[Any, Any]
+    _data_type: ZDType[_BaseDType, _BaseScalar]
     _shape: tuple[int, ...]
     _shard_shape: tuple[int, ...] | None = None
     _chunk_shape: tuple[int, ...] | None = None

src/zarr/core/array_spec.py

@@ -17,7 +17,7 @@
 
     from zarr.core.buffer import BufferPrototype
     from zarr.core.common import ChunkCoords
-    from zarr.core.dtype.wrapper import ZDType
+    from zarr.core.dtype.wrapper import ZDType, _BaseDType, _BaseScalar
 
 
 class ArrayConfigParams(TypedDict):
@@ -89,15 +89,15 @@ def parse_array_config(data: ArrayConfigLike | None) -> ArrayConfig:
 @dataclass(frozen=True)
 class ArraySpec:
     shape: ChunkCoords
-    dtype: ZDType[Any, Any]
+    dtype: ZDType[_BaseDType, _BaseScalar]
     fill_value: Any
     config: ArrayConfig
     prototype: BufferPrototype
 
     def __init__(
         self,
         shape: ChunkCoords,
-        dtype: ZDType[Any, Any],
+        dtype: ZDType[_BaseDType, _BaseScalar],
         fill_value: Any,
         config: ArrayConfig,
         prototype: BufferPrototype,

src/zarr/core/dtype/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, TypeAlias, get_args
+from typing import TYPE_CHECKING, TypeAlias, get_args
 
 if TYPE_CHECKING:
     from zarr.core.common import ZarrFormat
@@ -77,7 +77,7 @@
     | DateTime64
 )
 
-ZDTypeLike: TypeAlias = npt.DTypeLike | ZDType[Any, Any] | dict[str, JSON]
+ZDTypeLike: TypeAlias = npt.DTypeLike | ZDType[_BaseDType, _BaseScalar] | dict[str, JSON]
 
 for dtype in get_args(DTYPE):
     data_type_registry.register(dtype._zarr_v3_name, dtype)
@@ -114,7 +114,7 @@ def get_data_type_from_json(
     return data_type_registry.match_json(dtype, zarr_format=zarr_format)
 
 
-def parse_data_type(dtype: ZDTypeLike, zarr_format: ZarrFormat) -> ZDType[Any, Any]:
+def parse_data_type(dtype: ZDTypeLike, zarr_format: ZarrFormat) -> ZDType[_BaseDType, _BaseScalar]:
     """
     Interpret the input as a ZDType instance.
     """

src/zarr/core/dtype/_numpy.py

@@ -1232,7 +1232,7 @@ def check_dtype(cls, dtype: _BaseDType) -> TypeGuard[np.dtypes.VoidDType[int]]:
     def _from_dtype_unsafe(cls, dtype: _BaseDType) -> Self:
         from zarr.core.dtype import get_data_type_from_native_dtype
 
-        fields: list[tuple[str, ZDType[Any, Any]]] = []
+        fields: list[tuple[str, ZDType[_BaseDType, _BaseScalar]]] = []
 
         if dtype.fields is None:
             raise ValueError("numpy dtype has no fields")