💄rearrange protocols in Array

Signed-off-by: nstarman <[email protected]>

Author: nstarman

src/array_api_typing/_array.py

@@ -68,9 +68,10 @@ def dtype(self, /) -> DTypeT_co:
 
 
 class Array(
-    HasArrayNamespace[NamespaceT_co],
     # ------ Attributes -------
     HasDType[DTypeT_co],
+    # ------- Methods ---------
+    HasArrayNamespace[NamespaceT_co],
     # -------------------------
     Protocol[DTypeT_co, NamespaceT_co],
 ):

src/array_api_typing/_namespace.py

@@ -49,5 +49,9 @@ a_ns: xpt.Array[Any, ModuleType] = nparr
 # Note that `np.array_api` uses dtype objects, not dtype classes, so we can't
 # type annotate specific dtypes like `np.float32` or `np.int32`.
 _: xpt.Array[dtype[Any]] = nparr
-_: xpt.Array[dtype[Any]] = nparr_i32
-_: xpt.Array[dtype[Any]] = nparr_f32
+x_f32: xpt.Array[dtype[Any]] = nparr_f32
+x_i32: xpt.Array[dtype[Any]] = nparr_i32
+
+# Check Attribute `.dtype`
+_: dtype[Any] = x_f32.dtype
+_: dtype[Any] = x_i32.dtype

tests/integration/test_numpy1p0.pyi

@@ -11,12 +11,13 @@ import array_api_typing as xpt
 # DType aliases
 F32: TypeAlias = np.float32
 I32: TypeAlias = np.int32
+B: TypeAlias = np.bool_
 
 # Define NDArrays against which we can test the protocols
 nparr: npt.NDArray[Any]
 nparr_i32: npt.NDArray[I32]
 nparr_f32: npt.NDArray[F32]
-nparr_b: npt.NDArray[np.bool_]
+nparr_b: npt.NDArray[B]
 
 # =========================================================
 # `xpt.HasArrayNamespace`
@@ -42,7 +43,7 @@ _: xpt.HasArrayNamespace[dict[str, int]] = nparr  # not caught
 _: xpt.HasDType[Any] = nparr
 _: xpt.HasDType[np.dtype[I32]] = nparr_i32
 _: xpt.HasDType[np.dtype[F32]] = nparr_f32
-_: xpt.HasDType[np.dtype[np.bool_]] = nparr_b
+_: xpt.HasDType[np.dtype[B]] = nparr_b
 
 # =========================================================
 # `xpt.Array`
@@ -52,6 +53,11 @@ a_ns: xpt.Array[Any, ModuleType] = nparr
 
 # Check DTypeT_co assignment
 _: xpt.Array[Any] = nparr
-_: xpt.Array[np.dtype[I32]] = nparr_i32
-_: xpt.Array[np.dtype[F32]] = nparr_f32
-_: xpt.Array[np.dtype[np.bool_]] = nparr_b
+x_f32: xpt.Array[np.dtype[F32]] = nparr_f32
+x_i32: xpt.Array[np.dtype[I32]] = nparr_i32
+x_b: xpt.Array[np.dtype[B]] = nparr_b
+
+# Check Attribute `.dtype`
+_: np.dtype[F32] = x_f32.dtype
+_: np.dtype[I32] = x_i32.dtype
+_: np.dtype[B] = x_b.dtype