Merge branch 'main' into maybe-copy-store

Author: maxrjones

src/zarr/core/dtype/npy/structured.py

@@ -162,8 +162,10 @@ def to_json(
                 [f_name, f_dtype.to_json(zarr_format=zarr_format)]  # type: ignore[list-item]
                 for f_name, f_dtype in self.fields
             ]
-            base_dict = {"name": self._zarr_v3_name}
-            base_dict["configuration"] = {"fields": fields}  # type: ignore[assignment]
+            base_dict = {
+                "name": self._zarr_v3_name,
+                "configuration": {"fields": fields},
+            }
             return cast("DTypeSpec_V3", base_dict)
         raise ValueError(f"zarr_format must be 2 or 3, got {zarr_format}")  # pragma: no cover
 

src/zarr/core/dtype/wrapper.py

@@ -57,7 +57,7 @@
 
 
 @dataclass(frozen=True, kw_only=True, slots=True)
-class ZDType(Generic[TDType_co, TScalar_co], ABC):
+class ZDType(ABC, Generic[TDType_co, TScalar_co]):
     """
     Abstract base class for wrapping native array data types, e.g. numpy dtypes