Use importorskip

Author: adonath

tests/test_array_namespace.py

@@ -1,19 +1,18 @@
+import pytest
+
 import array_api_compat
 from array_api_compat import array_namespace
 
-from ._helpers import import_
-
-import pytest
 
 @pytest.mark.parametrize("library", ["cupy", "numpy", "torch", "dask.array"])
-@pytest.mark.parametrize("api_version", [None, '2021.12'])
+@pytest.mark.parametrize("api_version", [None, "2021.12"])
 def test_array_namespace(library, api_version):
- lib = import_(library)
+ lib = pytest.importorskip(library)
 
  array = lib.asarray([1.0, 2.0, 3.0])
  namespace = array_api_compat.array_namespace(array, api_version=api_version)
 
- if 'array_api' in library:
+ if "array_api" in library:
  assert namespace == lib
  else:
  if library == "dask.array":
@@ -23,21 +22,22 @@ 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())
 
- import numpy as np
  x = np.asarray([1, 2])
-
  pytest.raises(TypeError, lambda: array_namespace((x, x)))
  pytest.raises(TypeError, lambda: array_namespace(x, (x, x)))
 
- import torch
- y = torch.asarray([1, 2])
 
- pytest.raises(TypeError, lambda: array_namespace(x, y))
+def test_array_namespace_errors_torch():
+ torch = pytest.importorskip("torch")
 
- pytest.raises(ValueError, lambda: array_namespace(x, api_version='2022.12'))
+ y = torch.asarray([1, 2])
+ pytest.raises(TypeError, lambda: array_namespace(x, y))
+ pytest.raises(ValueError, lambda: array_namespace(x, api_version="2022.12"))
 
 
 def test_get_namespace():

tests/test_common.py

@@ -1,4 +1,3 @@
-from ._helpers import import_
 from array_api_compat import to_device
 
 import pytest
@@ -11,7 +10,7 @@ def test_to_device_host(library):
  # 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 = import_('array_api_compat.' + library)
+ xp = pytest.importorskip('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

@@ -3,10 +3,10 @@
 non-spec dtypes
 """
 
-from ._helpers import import_
-
 import pytest
 
+from ._helpers import import_
+
 # Check the known dtypes by their string names
 
 def _spec_dtypes(library):
@@ -66,7 +66,7 @@ def isdtype_(dtype_, kind):
 
 @pytest.mark.parametrize("library", ["cupy", "numpy", "torch", "dask.array"])
 def test_isdtype_spec_dtypes(library):
- xp = import_('array_api_compat.' + library)
+ xp = pytest.importorskip('array_api_compat.' + library)
 
  isdtype = xp.isdtype
 
@@ -101,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 = import_('array_api_compat.' + library)
+ xp = pytest.importorskip('array_api_compat.' + library)
 
  isdtype = xp.isdtype