Skip to content

Commit eae0392

Browse files
authored
Check if environment has skimage before running tests (#2102)
* Add has_skimage check * Add utils --------- Signed-off-by: Hannah Robarts <[email protected]>
1 parent 8c889a1 commit eae0392

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

Wrappers/Python/test/test_reconstructors.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
from cil.framework import AcquisitionGeometry
2121
from cil.utilities.dataexample import SIMULATED_PARALLEL_BEAM_DATA, SIMULATED_CONE_BEAM_DATA, SIMULATED_SPHERE_VOLUME
2222
from scipy.fft import fft, ifft
23-
from skimage.transform.radon_transform import _get_fourier_filter as skimage_get_fourier_filter
2423
import numpy as np
25-
from utils import has_tigre, has_ipp, has_astra, has_nvidia, has_matplotlib, initialise_tests
24+
from utils import has_tigre, has_ipp, has_astra, has_nvidia, has_matplotlib, has_skimage, initialise_tests
2625

2726
from cil.recon.Reconstructor import Reconstructor # checks on baseclass
2827
from cil.recon.FBP import GenericFilteredBackProjection # checks on baseclass
@@ -47,6 +46,8 @@
4746
if has_matplotlib:
4847
import matplotlib.testing.compare as compare
4948

49+
if has_skimage:
50+
from skimage.transform.radon_transform import _get_fourier_filter as skimage_get_fourier_filter
5051

5152
class Test_Reconstructor(unittest.TestCase):
5253

@@ -245,7 +246,7 @@ def test_set_filter(self):
245246
reconstructor.set_filter(filter[1:-1])
246247

247248

248-
@unittest.skipUnless(has_tigre and has_ipp, "TIGRE or IPP not installed")
249+
@unittest.skipUnless(has_tigre and has_ipp and has_skimage, "TIGRE, IPP or SKIMAGE not installed")
249250
def test_get_filter_array(self):
250251

251252
reconstructor = GenericFilteredBackProjection(self.ad3D)

Wrappers/Python/test/utils.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,14 @@ def initialise_tests():
134134
has_matplotlib = True
135135
system_state['has_matplotlib'] = has_matplotlib
136136

137+
#has_skimage
138+
module_info = importlib.util.find_spec("skimage")
139+
if module_info is None:
140+
has_skimage = False
141+
else:
142+
has_skimage = True
143+
system_state['has_skimage']= has_skimage
144+
137145
#has_zenodo_get
138146
module_info = importlib.util.find_spec("zenodo_get")
139147
if module_info is None:

0 commit comments

Comments
 (0)