push into v2

Author: d-v-b

src/zarr/api/asynchronous.py

@@ -21,7 +21,6 @@
     _default_zarr_format,
     _warn_order_kwarg,
     _warn_write_empty_chunks_kwarg,
-    parse_dtype,
 )
 from zarr.core.group import (
     AsyncGroup,
@@ -980,7 +979,7 @@ async def create(
         _handle_zarr_version_or_format(zarr_version=zarr_version, zarr_format=zarr_format)
         or _default_zarr_format()
     )
-    dtype_wrapped = parse_dtype(dtype, zarr_format=zarr_format)
+    dtype_wrapped = get_data_type_from_numpy(dtype)
     if zarr_format == 2:
         if chunks is None:
             chunks = shape

src/zarr/core/array.py

@@ -58,7 +58,6 @@
     _default_zarr_format,
     _warn_order_kwarg,
     concurrent_map,
-    parse_dtype,
     parse_order,
     parse_shapelike,
     product,
@@ -1034,7 +1033,7 @@ def compressors(self) -> tuple[numcodecs.abc.Codec, ...] | tuple[BytesBytesCodec
         )
 
     @property
-    def dtype(self) -> np.dtype[Any]:
+    def dtype(self) -> DTypeWrapper[Any, Any]:
         """Returns the data type of the array.
 
         Returns
@@ -3918,7 +3917,7 @@ async def init_array(
 
     from zarr.codecs.sharding import ShardingCodec, ShardingCodecIndexLocation
 
-    dtype_wrapped = parse_dtype(dtype, zarr_format=zarr_format)
+    dtype_wrapped = get_data_type_from_numpy(dtype)
     shape_parsed = parse_shapelike(shape)
     chunk_key_encoding_parsed = _parse_chunk_key_encoding(
         chunk_key_encoding, zarr_format=zarr_format

src/zarr/core/buffer/cpu.py

@@ -151,7 +151,7 @@ def create(
         cls,
         *,
         shape: Iterable[int],
-        dtype: DTypeWrapper[Any, Any],
+        dtype: np.dtype[Any],
         order: Literal["C", "F"] = "C",
         fill_value: Any | None = None,
     ) -> Self:
@@ -160,7 +160,7 @@ def create(
         else:
             return cls(
                 np.full(
-                    shape=tuple(shape), fill_value=fill_value, dtype=dtype.unwrap(), order=order
+                    shape=tuple(shape), fill_value=fill_value, dtype=dtype, order=order
                 )
             )
 

src/zarr/core/common.py

@@ -166,12 +166,6 @@ def parse_bool(data: Any) -> bool:
     raise ValueError(f"Expected bool, got {data} instead.")
 
 
-def parse_dtype(dtype: Any, zarr_format: ZarrFormat) -> DTypeWrapper[Any, Any]:
-    from zarr.registry import get_data_type_from_numpy
-
-    return get_data_type_from_numpy(np.dtype(dtype))
-
-
 def _warn_write_empty_chunks_kwarg() -> None:
     # TODO: link to docs page on array configuration in this message
     msg = (

src/zarr/core/metadata/v2.py

@@ -75,7 +75,9 @@ def __init__(
         """
         shape_parsed = parse_shapelike(shape)
         chunks_parsed = parse_shapelike(chunks)
-
+        # TODO: remove this
+        if not isinstance(dtype, DTypeWrapper):
+            raise TypeError
         compressor_parsed = parse_compressor(compressor)
         order_parsed = parse_indexing_order(order)
         dimension_separator_parsed = parse_separator(dimension_separator)

src/zarr/core/metadata/v3.py

@@ -4,17 +4,15 @@
 
 from zarr.abc.metadata import Metadata
 from zarr.core.buffer.core import default_buffer_prototype
-
+from zarr.core.metadata.dtype import DTypeWrapper
 if TYPE_CHECKING:
     from collections.abc import Callable
     from typing import Self
 
     from zarr.core.buffer import Buffer, BufferPrototype
     from zarr.core.chunk_grids import ChunkGrid
     from zarr.core.common import JSON, ChunkCoords
-    from zarr.core.metadata.dtype import (
-        DTypeWrapper,
-    )
+    
 
 import json
 from collections.abc import Iterable
@@ -262,6 +260,10 @@ def __init__(
         """
         Because the class is a frozen dataclass, we set attributes using object.__setattr__
         """
+
+        # TODO: remove this
+        if not isinstance(data_type, DTypeWrapper):
+            raise TypeError
         shape_parsed = parse_shapelike(shape)
         chunk_grid_parsed = ChunkGrid.from_dict(chunk_grid)
         chunk_key_encoding_parsed = ChunkKeyEncoding.from_dict(chunk_key_encoding)

tests/conftest.py

@@ -18,11 +18,12 @@
     _parse_chunk_key_encoding,
 )
 from zarr.core.chunk_grids import RegularChunkGrid, _auto_partition
-from zarr.core.common import JSON, parse_dtype, parse_shapelike
+from zarr.core.common import JSON, parse_shapelike
 from zarr.core.config import config as zarr_config
 from zarr.core.metadata.v2 import ArrayV2Metadata
 from zarr.core.metadata.v3 import ArrayV3Metadata
 from zarr.core.sync import sync
+from zarr.registry import get_data_type_from_numpy
 from zarr.storage import FsspecStore, LocalStore, MemoryStore, StorePath, ZipStore
 
 if TYPE_CHECKING:
@@ -252,7 +253,7 @@ def create_array_metadata(
     """
     Create array metadata
     """
-    dtype_parsed = parse_dtype(dtype, zarr_format=zarr_format)
+    dtype_parsed = get_data_type_from_numpy(dtype)
     shape_parsed = parse_shapelike(shape)
     chunk_key_encoding_parsed = _parse_chunk_key_encoding(
         chunk_key_encoding, zarr_format=zarr_format