remove inheritance from ArrayMetadata

Author: d-v-b

src/zarr/core/metadata/common.py

@@ -5,8 +5,6 @@
 if TYPE_CHECKING:
     from typing import Any, Literal, Self
 
-    import numpy as np
-
     from zarr.core.array_spec import ArraySpec
     from zarr.core.buffer import Buffer, BufferPrototype
     from zarr.core.chunk_grids import ChunkGrid

src/zarr/core/metadata/v2.py

@@ -4,6 +4,8 @@
 from enum import Enum
 from typing import TYPE_CHECKING
 
+from zarr.abc.metadata import Metadata
+
 if TYPE_CHECKING:
     from typing import Any, Literal, Self
 
@@ -23,11 +25,11 @@
 from zarr.core.chunk_key_encodings import parse_separator
 from zarr.core.common import ZARRAY_JSON, ZATTRS_JSON, parse_shapelike
 from zarr.core.config import config, parse_indexing_order
-from zarr.core.metadata.common import ArrayMetadata, parse_attributes
+from zarr.core.metadata.common import parse_attributes
 
 
 @dataclass(frozen=True, kw_only=True)
-class ArrayV2Metadata(ArrayMetadata):
+class ArrayV2Metadata(Metadata):
     shape: ChunkCoords
     chunks: RegularChunkGrid
     dtype: np.dtype[Any]
@@ -144,7 +146,7 @@ def from_dict(cls, data: dict[str, Any]) -> ArrayV2Metadata:
 
     def to_dict(self) -> dict[str, JSON]:
         zarray_dict = super().to_dict()
-        _ = zarray_dict.pop("chunk_grid")
+        _ = zarray_dict.pop("chunks")
         zarray_dict["chunks"] = self.chunks.chunk_shape
 
         _ = zarray_dict.pop("dtype")

src/zarr/core/metadata/v3.py

@@ -3,6 +3,8 @@
 import warnings
 from typing import TYPE_CHECKING, cast, overload
 
+from zarr.abc.metadata import Metadata
+
 if TYPE_CHECKING:
     from typing import Self
 
@@ -28,7 +30,7 @@
 from zarr.core.chunk_key_encodings import ChunkKeyEncoding
 from zarr.core.common import ZARR_JSON, parse_named_configuration, parse_shapelike
 from zarr.core.config import config
-from zarr.core.metadata.common import ArrayMetadata, parse_attributes
+from zarr.core.metadata.common import parse_attributes
 from zarr.registry import get_codec_class
 
 
@@ -150,7 +152,7 @@ def _replace_special_floats(obj: object) -> Any:
 
 
 @dataclass(frozen=True, kw_only=True)
-class ArrayV3Metadata(ArrayMetadata):
+class ArrayV3Metadata(Metadata):
     shape: ChunkCoords
     data_type: np.dtype[Any]
     chunk_grid: ChunkGrid