Merge branch 'main' into 2023.12

Author: asmeurer

.github/workflows/array-api-tests.yml

@@ -3,7 +3,7 @@ name: Array API Tests
 on: [push, pull_request]
 
 env:
-  PYTEST_ARGS: "-v -rxXfE --ci --hypothesis-disable-deadline"
+  PYTEST_ARGS: "-v -rxXfE --ci --hypothesis-disable-deadline --max-examples 200"
 
 jobs:
   array-api-tests:

.github/workflows/ruff.yml

@@ -0,0 +1,19 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  check-ruff:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install ruff
+      # Update output format to enable automatic inline annotations.
+      - name: Run Ruff
+        run: ruff check --output-format=github .

array_api_strict/__init__.py

@@ -83,6 +83,7 @@
     "broadcast_to",
     "can_cast",
     "finfo",
+    "isdtype",
     "iinfo",
     "result_type",
 ]
@@ -114,6 +115,8 @@
     "uint64",
     "float32",
     "float64",
+    "complex64",
+    "complex128",
     "bool",
 ]
 
@@ -198,6 +201,7 @@
     "bitwise_xor",
     "ceil",
     "clip",
+    "conj",
     "cos",
     "cosh",
     "divide",
@@ -208,6 +212,7 @@
     "floor_divide",
     "greater",
     "greater_equal",
+    "imag",
     "isfinite",
     "isinf",
     "isnan",
@@ -227,6 +232,7 @@
     "not_equal",
     "positive",
     "pow",
+    "real",
     "remainder",
     "round",
     "sign",

array_api_strict/_array_object.py

@@ -33,11 +33,12 @@
 )
 from ._flags import get_array_api_strict_flags, set_array_api_strict_flags
 
-from typing import TYPE_CHECKING, Optional, Tuple, Union, Any, SupportsIndex
+from typing import TYPE_CHECKING, SupportsIndex
 import types
 
 if TYPE_CHECKING:
-    from ._typing import Any, PyCapsule, Device, Dtype
+    from typing import Optional, Tuple, Union, Any
+    from ._typing import PyCapsule, Device, Dtype
     import numpy.typing as npt
 
 import numpy as np
@@ -589,8 +590,8 @@ def __getitem__(
         key: Union[
             int,
             slice,
-            ellipsis,
-            Tuple[Union[int, slice, ellipsis, None], ...],
+            ellipsis,  # noqa: F821
+            Tuple[Union[int, slice, ellipsis, None], ...],  # noqa: F821
             Array,
         ],
         /,
@@ -780,7 +781,7 @@ def __rshift__(self: Array, other: Union[int, Array], /) -> Array:
     def __setitem__(
         self,
         key: Union[
-            int, slice, ellipsis, Tuple[Union[int, slice, ellipsis], ...], Array
+            int, slice, ellipsis, Tuple[Union[int, slice, ellipsis], ...], Array  # noqa: F821
         ],
         value: Union[int, float, bool, Array],
         /,

array_api_strict/_data_type_functions.py

@@ -15,11 +15,11 @@
 )
 
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, List, Tuple, Union
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
+    from typing import List, Tuple, Union
     from ._typing import Dtype
-    from collections.abc import Sequence
 
 import numpy as np
 

array_api_strict/_indexing_functions.py

@@ -3,6 +3,11 @@
 from ._array_object import Array
 from ._dtypes import _integer_dtypes
 
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from typing import Optional
+
 import numpy as np
 
 def take(x: Array, indices: Array, /, *, axis: Optional[int] = None) -> Array:

array_api_strict/_manipulation_functions.py

@@ -3,7 +3,10 @@
 from ._array_object import Array
 from ._data_type_functions import result_type
 
-from typing import List, Optional, Tuple, Union
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from typing import List, Optional, Tuple, Union
 
 import numpy as np
 
@@ -57,7 +60,7 @@ def reshape(x: Array,
             /,
             shape: Tuple[int, ...],
             *,
-            copy: Optional[Bool] = None) -> Array:
+            copy: Optional[bool] = None) -> Array:
     """
     Array API compatible wrapper for :py:func:`np.reshape <numpy.reshape>`.
 

array_api_strict/_searching_functions.py

@@ -4,7 +4,9 @@
 from ._dtypes import _result_type, _real_numeric_dtypes
 from ._flags import requires_data_dependent_shapes
 
-from typing import Optional, Tuple
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from typing import Optional, Tuple
 
 import numpy as np
 

array_api_strict/_statistical_functions.py

@@ -6,11 +6,12 @@
     _numeric_dtypes,
 )
 from ._array_object import Array
-from ._dtypes import float32, float64, complex64, complex128
+from ._dtypes import float32, complex64
 
-from typing import TYPE_CHECKING, Optional, Tuple, Union
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
+    from typing import Optional, Tuple, Union
     from ._typing import Dtype
 
 import numpy as np

array_api_strict/_typing.py

@@ -21,10 +21,6 @@
 
 from typing import (
     Any,
-    Literal,
-    Sequence,
-    Type,
-    Union,
     TypeVar,
     Protocol,
 )