Rename import_ to import_or_skip_cupy

Author: adonath

tests/_helpers.py

@@ -2,7 +2,8 @@
 
 import pytest
 
-def import_(library):
-    if 'cupy' in library:
+
+def import_or_skip_cupy(library):
+    if "cupy" in library:
         return pytest.importorskip(library)
     return import_module(library)

tests/test_array_namespace.py

@@ -1,19 +1,23 @@
+import numpy as np
 import pytest
+import torch
 
 import array_api_compat
 from array_api_compat import array_namespace
 
+from ._helpers import import_or_skip_cupy
+
 
 @pytest.mark.parametrize("library", ["cupy", "numpy", "torch", "dask.array"])
 @pytest.mark.parametrize("api_version", [None, "2021.12"])
 def test_array_namespace(library, api_version):
-    lib = pytest.importorskip(library)
+    xp = import_or_skip_cupy(library)
 
-    array = lib.asarray([1.0, 2.0, 3.0])
+    array = xp.asarray([1.0, 2.0, 3.0])
     namespace = array_api_compat.array_namespace(array, api_version=api_version)
 
     if "array_api" in library:
-        assert namespace == lib
+        assert namespace == xp
     else:
         if library == "dask.array":
             assert namespace == array_api_compat.dask.array
@@ -22,8 +26,6 @@ def test_array_namespace(library, api_version):
 
 
 def test_array_namespace_errors():
-    np = pytest.importorskip("numpy")
-
     pytest.raises(TypeError, lambda: array_namespace([1]))
     pytest.raises(TypeError, lambda: array_namespace())
 
@@ -33,9 +35,6 @@ def test_array_namespace_errors():
 
 
 def test_array_namespace_errors_torch():
-    torch = pytest.importorskip("torch")
-    np = pytest.importorskip("numpy")
-
     y = torch.asarray([1, 2])
     x = np.asarray([1, 2])
     pytest.raises(TypeError, lambda: array_namespace(x, y))

tests/test_common.py

@@ -1,16 +1,20 @@
-from array_api_compat import to_device
-
-import pytest
 import numpy as np
+import pytest
 from numpy.testing import assert_allclose
 
+from array_api_compat import to_device
+
+from ._helpers import import_or_skip_cupy
+
+
 @pytest.mark.parametrize("library", ["cupy", "numpy", "torch", "dask.array"])
 def test_to_device_host(library):
     # different libraries have different semantics
     # for DtoH transfers; ensure that we support a portable
     # shim for common array libs
     # see: https://github.com/scipy/scipy/issues/18286#issuecomment-1527552919
-    xp = pytest.importorskip('array_api_compat.' + library)
+    xp = import_or_skip_cupy("array_api_compat." + library)
+    
     expected = np.array([1, 2, 3])
     x = xp.asarray([1, 2, 3])
     x = to_device(x, "cpu")

tests/test_isdtype.py

@@ -5,6 +5,8 @@
 
 import pytest
 
+from ._helpers import import_or_skip_cupy
+
 # Check the known dtypes by their string names
 
 def _spec_dtypes(library):
@@ -59,12 +61,12 @@ def isdtype_(dtype_, kind):
         res = dtype_categories[kind](dtype_)
     else:
         res = dtype_ == kind
-    assert isinstance(res, bool)
+    assert type(res) is bool #  noqa: E721
     return res
 
 @pytest.mark.parametrize("library", ["cupy", "numpy", "torch", "dask.array"])
 def test_isdtype_spec_dtypes(library):
-    xp = pytest.importorskip('array_api_compat.' + library)
+    xp = import_or_skip_cupy('array_api_compat.' + library)
 
     isdtype = xp.isdtype
 
@@ -99,7 +101,7 @@ def test_isdtype_spec_dtypes(library):
 @pytest.mark.parametrize("library", ["cupy", "numpy", "torch", "dask.array"])
 @pytest.mark.parametrize("dtype_", additional_dtypes)
 def test_isdtype_additional_dtypes(library, dtype_):
-    xp = pytest.importorskip('array_api_compat.' + library)
+    xp = import_or_skip_cupy('array_api_compat.' + library)
 
     isdtype = xp.isdtype
 

tests/test_vendoring.py

@@ -3,19 +3,21 @@
 
 def test_vendoring_numpy():
     from vendor_test import uses_numpy
+
     uses_numpy._test_numpy()
 
 
 def test_vendoring_cupy():
     pytest.importorskip("cupy")
 
     from vendor_test import uses_cupy
+
     uses_cupy._test_cupy()
 
+
 def test_vendoring_torch():
-    pytest.importorskip("torch")
-    
     from vendor_test import uses_torch
+
     uses_torch._test_torch()
 
 def test_vendoring_dask():