TST: adapt tests for the lack of __array__

Author: ev-br

array_api_strict/_creation_functions.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from contextlib import contextmanager
 from typing import TYPE_CHECKING, List, Optional, Tuple, Union
 
 if TYPE_CHECKING:
@@ -16,19 +15,6 @@
 
 import numpy as np
 
-@contextmanager
-def allow_array():
-    """
-    Temporarily enable Array.__array__. This is needed for np.array to parse
-    list of lists of Array objects.
-    """
-    from . import _array_object
-    original_value = _array_object._allow_array
-    try:
-        _array_object._allow_array = True
-        yield
-    finally:
-        _array_object._allow_array = original_value
 
 def _check_valid_dtype(dtype):
     # Note: Only spelling dtypes as the dtype objects is supported.
@@ -112,8 +98,8 @@ def asarray(
         # Give a better error message in this case. NumPy would convert this
         # to an object array. TODO: This won't handle large integers in lists.
         raise OverflowError("Integer out of bounds for array dtypes")
-    with allow_array():
-        res = np.array(obj, dtype=_np_dtype, copy=copy)
+
+    res = np.array(obj, dtype=_np_dtype, copy=copy)
     return Array._new(res, device=device)
 
 

array_api_strict/tests/test_array_object.py

@@ -1,3 +1,4 @@
+import sys
 import operator
 from builtins import all as all_
 
@@ -351,6 +352,10 @@ def test_array_properties():
     assert b.mT.shape == (3, 2)
 
 
+@pytest.mark.xfail(sys.version_info.major*100 + sys.version_info.minor < 312,
+                   reason="array conversion relies on buffer protocol, and "
+                          "requires python >= 3.12"
+)
 def test_array_conversion():
     # Check that arrays on the CPU device can be converted to NumPy
     # but arrays on other devices can't. Note this is testing the logic in
@@ -361,25 +366,9 @@ def test_array_conversion():
 
     for device in ("device1", "device2"):
         a = ones((2, 3), device=array_api_strict.Device(device))
-        with pytest.raises(RuntimeError, match="Can not convert array"):
+        with pytest.raises((RuntimeError, TypeError)):
             asarray([a])
 
-def test__array__():
-    # __array__ should work for now
-    a = ones((2, 3))
-    np.array(a)
-
-    # Test the _allow_array private global flag for disabling it in the
-    # future.
-    from .. import _array_object
-    original_value = _array_object._allow_array
-    try:
-        _array_object._allow_array = False
-        a = ones((2, 3))
-        with pytest.raises(ValueError, match="Conversion from an array_api_strict array to a NumPy ndarray is not supported"):
-            np.array(a)
-    finally:
-        _array_object._allow_array = original_value
 
 def test_allow_newaxis():
     a = ones(5)

array_api_strict/tests/test_creation_functions.py

@@ -1,3 +1,4 @@
+import sys
 import warnings
 
 from numpy.testing import assert_raises
@@ -97,7 +98,12 @@ def test_asarray_copy():
     a[0] = 0
     assert all(b[0] == 0)
 
-def test_asarray_list_of_lists():
+
+@pytest.mark.xfail(sys.version_info.major*100 + sys.version_info.minor < 312,
+                   reason="array conversion relies on buffer protocol, and "
+                          "requires python >= 3.12"
+)
+def test_asarray_list_of_arrays():
     a = asarray(1, dtype=int16)
     b = asarray([1], dtype=int16)
     res = asarray([a, a])