Skip tests when missing dependencies

Author: CPBridge

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "highdicom"
-version = "0.23.0"
+version = "0.24.0"
 description = "High-level DICOM abstractions."
 readme = "README.md"
 requires-python = ">=3.10"

src/highdicom/version.py

@@ -1 +1 @@
-__version__ = '0.23.0'
+__version__ = '0.24.0'

tests/test_image.py

@@ -1241,12 +1241,15 @@ def test_instantiation():
 
 
 @pytest.mark.parametrize(
-    'f',
+    'f,dependency',
     find_readable_images(),
 )
-def test_imread_all_test_files(f):
+def test_imread_all_test_files(f, dependency):
     # A simple test that the reads in all images in the pydicom test suite
     # and gets a single frame
+    if dependency is not None:
+        pytest.importorskip(dependency)
+
     im = imread(f)
     im_lazy = imread(f, lazy_frame_retrieval=True)
 

tests/test_io.py

@@ -278,10 +278,13 @@ def test_extended_offsets(self):
 
 
 @pytest.mark.parametrize(
-    'filename',
+    'filename,dependency',
     find_readable_images(),
 )
-def test_all_images(filename):
+def test_all_images(filename, dependency):
+    if dependency is not None:
+        pytest.importorskip(dependency)
+
     dataset = dcmread(filename)
     pixel_array = dataset.pixel_array
 

tests/utils.py

@@ -4,6 +4,7 @@
 from pydicom.data import get_testdata_files
 from pydicom.dataset import Dataset, FileMetaDataset
 from pydicom.filereader import dcmread
+from pydicom import uid
 
 
 from highdicom._module_utils import (
@@ -30,10 +31,15 @@ def write_and_read_dataset(dataset: Dataset):
         return dcmread(fp, force=True)
 
 
-def find_readable_images() -> list[str]:
+def find_readable_images() -> list[tuple[str, str | None]]:
     """Get a list of all images in highdicom and pydicom test data that should
     be expected to work with image reading routines.
 
+    Returns a list of tuples (path, dependency), where path is the filepath,
+    and dependency is either None if the file can be read using only required
+    dependencies, or a str that can be used with pytest.importorskip if an
+    optional dependency is required to decode pixel data.
+
     """
     # All pydicom test files
     all_files = get_testdata_files()
@@ -97,6 +103,19 @@ def find_readable_images() -> list[str]:
         if excluded:
             continue
 
-        files_to_use.append(f)
+        dependency = None
+        if dcm.file_meta.TransferSyntaxUID in (
+            uid.JPEGExtended12Bit,
+            uid.JPEGLosslessSV1,
+        ):
+            dependency = "libjpeg"
+
+        if dcm.file_meta.TransferSyntaxUID in (
+            uid.JPEG2000,
+            uid.JPEG2000Lossless,
+        ):
+            dependency = "openjpeg"
+
+        files_to_use.append((f, dependency))
 
     return files_to_use