fixes

Author: crusaderky

array_api_strict/_array_object.py

@@ -20,7 +20,7 @@
 from collections.abc import Iterator
 from enum import IntEnum
 from types import ModuleType
-from typing import Any, Final, Literal, SupportsIndex
+from typing import TYPE_CHECKING, Any, Final, Literal, SupportsIndex
 
 import numpy as np
 import numpy.typing as npt
@@ -213,7 +213,7 @@ def _check_allowed_dtypes(
 
         if self.dtype not in _dtype_categories[dtype_category]:
             raise TypeError(f"Only {dtype_category} dtypes are allowed in {op}")
-        if isinstance(other, (int, complex, float, bool)):
+        if isinstance(other, (bool, int, float, complex)):
             other = self._promote_scalar(other)
         elif isinstance(other, Array):
             if other.dtype not in _dtype_categories[dtype_category]:
@@ -243,7 +243,7 @@ def _check_allowed_dtypes(
 
     def _check_device(self, other: Array | complex) -> None:
         """Check that other is on a device compatible with the current array"""
-        if isinstance(other, (int, complex, float, bool)):
+        if isinstance(other, (bool, int, float, complex)):
             return
         elif isinstance(other, Array):
             if self.device != other.device:
@@ -1098,7 +1098,7 @@ def __rmatmul__(self, other: Array, /) -> Array:
         res = self._array.__rmatmul__(other._array)
         return self.__class__._new(res, device=self.device)
 
-    def __imod__(self, other: Array | complex, /) -> Array:
+    def __imod__(self, other: Array | float, /) -> Array:
         """
         Performs the operation __imod__.
         """

array_api_strict/_creation_functions.py

@@ -3,7 +3,7 @@
 from collections.abc import Generator
 from contextlib import contextmanager
 from enum import Enum
-from typing import TYPE_CHECKING, Literal, cast
+from typing import TYPE_CHECKING, Literal
 
 import numpy as np
 
@@ -18,6 +18,7 @@
     # Circular import
     from ._array_object import Array, Device
 
+
 class Undef(Enum):
     UNDEF = 0
 
@@ -316,8 +317,7 @@ def linspace(
     )
 
 
-# Note: indexing was 'str' in <=2024.12
-def meshgrid(*arrays: Array, indexing: str = "xy") -> list[Array]:
+def meshgrid(*arrays: Array, indexing: Literal["xy", "ij"] = "xy") -> list[Array]:
     """
     Array API compatible wrapper for :py:func:`np.meshgrid <numpy.meshgrid>`.
 
@@ -340,11 +340,9 @@ def meshgrid(*arrays: Array, indexing: str = "xy") -> list[Array]:
     else:
         device = None
 
-    np_indexing = cast(Literal["xy", "ij"], indexing)
-
     return [
         Array._new(array, device=device)
-        for array in np.meshgrid(*[a._array for a in arrays], indexing=np_indexing)
+        for array in np.meshgrid(*[a._array for a in arrays], indexing=indexing)
     ]
 
 

array_api_strict/_elementwise_functions.py

@@ -270,8 +270,8 @@ def ceil(x: Array, /) -> Array:
 def clip(
     x: Array,
     /,
-    min: Array | complex | None = None,
-    max: Array | complex | None = None,
+    min: Array | float | None = None,
+    max: Array | float | None = None,
 ) -> Array:
     """
     Array API compatible wrapper for :py:func:`np.clip <numpy.clip>`.

array_api_strict/_flags.py

@@ -37,7 +37,7 @@
     "2021.12",
     "2022.12",
     "2023.12",
-    "2024.12"
+    "2024.12",
 )
 
 draft_version = "2025.12"
@@ -390,6 +390,7 @@ def set_flags_from_environment() -> None:
 
 # Decorators
 
+
 def requires_api_version(version: str) -> Callable[[_CallableT], _CallableT]:
     def decorator(func: Callable[P, T]) -> Callable[P, T]:
         @functools.wraps(func)