Use pytest.importorskip, more modern test skips

Author: agriyakhetarpal

tests/test_blosc.py

@@ -4,14 +4,6 @@
 import numpy as np
 import pytest
 
-try:
-    from numcodecs.blosc import Blosc
-
-    from numcodecs import blosc
-except ImportError:  # pragma: no cover
-    pytest.skip("numcodecs.blosc not available", allow_module_level=True)
-
-
 from tests.common import (
     check_backwards_compatibility,
     check_config,
@@ -22,6 +14,9 @@
     is_wasm,
 )
 
+blosc = pytest.importorskip("numcodecs.blosc")
+Blosc = blosc.Blosc
+
 codecs = [
     Blosc(shuffle=Blosc.SHUFFLE),
     Blosc(clevel=0, shuffle=Blosc.SHUFFLE),

tests/test_lz4.py

@@ -3,12 +3,6 @@
 import numpy as np
 import pytest
 
-try:
-    from numcodecs.lz4 import LZ4
-except ImportError:  # pragma: no cover
-    pytest.skip("numcodecs.lz4 not available", allow_module_level=True)
-
-
 from tests.common import (
     check_backwards_compatibility,
     check_config,
@@ -19,6 +13,8 @@
     check_repr,
 )
 
+LZ4 = pytest.importorskip("numcodecs.lz4").LZ4
+
 codecs = [
     LZ4(),
     LZ4(acceleration=-1),

tests/test_lzma.py

@@ -1,18 +1,10 @@
 import itertools
-import unittest
 from types import ModuleType
 from typing import cast
 
 import numpy as np
 import pytest
 
-try:
-    # noinspection PyProtectedMember
-    from numcodecs.lzma import LZMA, _lzma
-except ImportError as e:  # pragma: no cover
-    raise unittest.SkipTest("LZMA not available") from e
-
-
 from tests.common import (
     check_backwards_compatibility,
     check_config,
@@ -22,6 +14,10 @@
     check_repr,
 )
 
+_lzma_mod = pytest.importorskip("numcodecs.lzma")
+LZMA = _lzma_mod.LZMA
+_lzma = _lzma_mod._lzma
+
 _lzma = cast(ModuleType, _lzma)
 
 codecs = [

tests/test_msgpacks.py

@@ -1,14 +1,6 @@
-import unittest
-
 import numpy as np
 import pytest
 
-try:
-    from numcodecs.msgpacks import MsgPack
-except ImportError as e:  # pragma: no cover
-    raise unittest.SkipTest("msgpack not available") from e
-
-
 from tests.common import (
     check_backwards_compatibility,
     check_config,
@@ -17,6 +9,8 @@
     greetings,
 )
 
+MsgPack = pytest.importorskip("numcodecs.msgpacks").MsgPack
+
 # object array with strings
 # object array with mix strings / nans
 # object array with mix of string, int, float

tests/test_pyzstd.py

@@ -2,9 +2,11 @@
 
 import numpy as np
 import pytest
-import pyzstd
 from numcodecs.zstd import Zstd
 
+pyzstd = pytest.importorskip("pyzstd")
+
+
 test_data = [
     b"Hello World!",
     np.arange(113).tobytes(),

tests/test_shuffle.py

@@ -4,19 +4,15 @@
 import numpy as np
 import pytest
 
-try:
-    from numcodecs.shuffle import Shuffle
-except ImportError:  # pragma: no cover
-    pytest.skip("numcodecs.shuffle not available", allow_module_level=True)
-
-
 from tests.common import (
     check_backwards_compatibility,
     check_config,
     check_encode_decode,
     is_wasm,
 )
 
+Shuffle = pytest.importorskip("numcodecs.shuffle").Shuffle
+
 codecs = [
     Shuffle(),
     Shuffle(elementsize=0),

tests/test_vlen_array.py

@@ -1,12 +1,6 @@
-import unittest
-
 import numpy as np
 import pytest
 
-try:
-    from numcodecs.vlen import VLenArray
-except ImportError as e:  # pragma: no cover
-    raise unittest.SkipTest("vlen-array not available") from e
 from tests.common import (
     assert_array_items_equal,
     check_backwards_compatibility,
@@ -15,6 +9,8 @@
     check_repr,
 )
 
+VLenArray = pytest.importorskip("numcodecs.vlen").VLenArray
+
 arrays = [
     np.array([np.array([1, 2, 3]), np.array([4]), np.array([5, 6])] * 300, dtype=object),
     np.array([np.array([1, 2, 3]), np.array([4]), np.array([5, 6])] * 300, dtype=object).reshape(

tests/test_vlen_bytes.py

@@ -1,12 +1,6 @@
-import unittest
-
 import numpy as np
 import pytest
 
-try:
-    from numcodecs.vlen import VLenBytes
-except ImportError as e:  # pragma: no cover
-    raise unittest.SkipTest("vlen-bytes not available") from e
 from tests.common import (
     assert_array_items_equal,
     check_backwards_compatibility,
@@ -16,6 +10,8 @@
     greetings,
 )
 
+VLenBytes = pytest.importorskip("numcodecs.vlen").VLenBytes
+
 greetings_bytes = [g.encode('utf-8') for g in greetings]
 
 

tests/test_vlen_utf8.py

@@ -1,12 +1,6 @@
-import unittest
-
 import numpy as np
 import pytest
 
-try:
-    from numcodecs.vlen import VLenUTF8
-except ImportError as e:  # pragma: no cover
-    raise unittest.SkipTest("vlen-utf8 not available") from e
 from tests.common import (
     assert_array_items_equal,
     check_backwards_compatibility,
@@ -16,6 +10,8 @@
     greetings,
 )
 
+VLenUTF8 = pytest.importorskip("numcodecs.vlen").VLenUTF8
+
 arrays = [
     np.array(['foo', 'bar', 'baz'] * 300, dtype=object),
     np.array(greetings * 100, dtype=object),

tests/test_zfpy.py

@@ -4,13 +4,6 @@
 import numpy as np
 import pytest
 
-try:
-    # noinspection PyProtectedMember
-    from numcodecs.zfpy import ZFPY, _zfpy
-except ImportError:  # pragma: no cover
-    pytest.skip("ZFPY not available", allow_module_level=True)
-
-
 from tests.common import (
     check_backwards_compatibility,
     check_config,
@@ -20,6 +13,10 @@
     check_repr,
 )
 
+_zfpy_mod = pytest.importorskip("numcodecs.zfpy")
+ZFPY = _zfpy_mod.ZFPY
+_zfpy = _zfpy_mod._zfpy
+
 _zfpy = cast(ModuleType, _zfpy)