Merge branch 'main' into issue-3780-ndarray-like-typing

Author: abishop1990

changes/3797.bugfix.md

@@ -0,0 +1,2 @@
+Fix an issue that prevents the correct parsing of special NumPy ``uint32`` dtypes resulting e.g.
+from bit wise operations on ``uint32`` arrays on Windows.

mkdocs.yml

@@ -216,7 +216,6 @@ plugins:
         'developers/index.html.md': 'contributing.md'
         'developers/roadmap.html.md': 'https://zarr.readthedocs.io/en/v3.0.8/developers/roadmap.html'
         'api/zarr/creation.md': 'api/zarr/deprecated/creation.md'
-        'api/zarr/codecs/numcodecs.md': 'api/zarr/deprecated/creation.md'
         'api.md': 'api/zarr/index.md'
         'api/zarr/metadata/migrate_v3.md': 'api/zarr/metadata.md'
 

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

@@ -1070,6 +1070,28 @@ class UInt32(BaseInt[np.dtypes.UInt32DType, np.uint32], HasEndianness):
     _zarr_v3_name: ClassVar[Literal["uint32"]] = "uint32"
     _zarr_v2_names: ClassVar[tuple[Literal[">u4"], Literal["<u4"]]] = (">u4", "<u4")
 
+    @classmethod
+    def _check_native_dtype(cls: type[Self], dtype: TBaseDType) -> TypeGuard[np.dtypes.UInt32DType]:
+        """
+        A type guard that checks if the input is assignable to the type of ``cls.dtype_class``
+
+        This method is overridden for this particular data type because of a Windows-specific issue
+        where ``np.array([1], dtype=np.uint32) & 1`` creates an instance of ``np.dtypes.UIntDType``,
+        rather than an instance of ``np.dtypes.UInt32DType``, even though both represent 32-bit
+        unsigned integers. (In contrast to ``np.dtype('i')``, ``np.dtype('u')`` raises an error.)
+
+        Parameters
+        ----------
+        dtype : TDType
+            The dtype to check.
+
+        Returns
+        -------
+        Bool
+            True if the dtype matches, False otherwise.
+        """
+        return super()._check_native_dtype(dtype) or dtype == np.dtypes.UInt32DType()
+
     @classmethod
     def from_native_dtype(cls, dtype: TBaseDType) -> Self:
         """

tests/test_dtype/test_npy/test_int.py

@@ -216,7 +216,16 @@ class TestUInt16(BaseTestZDType):
 class TestUInt32(BaseTestZDType):
     test_cls = UInt32
     scalar_type = np.uint32
-    valid_dtype = (np.dtype(">u4"), np.dtype("<u4"))
+
+    # On Windows, this creates an UIntDType (instead of UInt32DType),
+    # similar to how np.dtype('i') creates an IntDType instead of Int32DType.
+    # However, np.dtype('u') raises a TypeError.
+    uint_dtype = (np.array([1], dtype=np.uint32) & 1).dtype
+
+    # The behavior of some tests associated with this class variable are
+    # order-dependent -- uint_dtype correctly fails certain tests only if it's not
+    # in the last position of the tuple. I have no idea how this is possible!
+    valid_dtype = (uint_dtype, np.dtype(">u4"), np.dtype("<u4"))
     invalid_dtype = (
         np.dtype(np.int8),
         np.dtype(np.int16),