diff --git a/skimage/viewer/tests/test_plugins.py b/skimage/viewer/tests/test_plugins.py index 2f4d5ef5..7ef62730 100644 --- a/skimage/viewer/tests/test_plugins.py +++ b/skimage/viewer/tests/test_plugins.py @@ -15,10 +15,9 @@ try: PlotPlugin) from skimage.viewer.plugins.base import Plugin from skimage.viewer.widgets import Slider + viewer_available = not qt_api is None except ImportError: - skip_all = True -else: - skip_all = False + viewer_available = False def setup_line_profile(image, limits='image'): @@ -28,7 +27,7 @@ def setup_line_profile(image, limits='image'): return plugin -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_line_profile(): """ Test a line profile using an ndim=2 image""" plugin = setup_line_profile(data.camera()) @@ -42,7 +41,7 @@ def test_line_profile(): assert_allclose(scan_data.mean(), 0.2812, rtol=1e-3) -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_line_profile_rgb(): """ Test a line profile using an ndim=3 image""" plugin = setup_line_profile(data.chelsea(), limits=None) @@ -57,7 +56,7 @@ def test_line_profile_rgb(): assert_allclose(scan_data.mean(), 0.4359, rtol=1e-3) -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_line_profile_dynamic(): """Test a line profile updating after an image transform""" image = data.coins()[:-50, :] # shave some off to make the line lower @@ -82,7 +81,7 @@ def test_line_profile_dynamic(): assert_almost_equal(np.max(line) - np.min(line), 0.639, 1) -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_measure(): image = data.camera() viewer = ImageViewer(image) @@ -94,7 +93,7 @@ def test_measure(): assert_equal(str(m._angle.text[:5]), '135.0') -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_canny(): image = data.camera() viewer = ImageViewer(image) @@ -107,7 +106,7 @@ def test_canny(): assert edges.sum() == 2852 -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_label_painter(): image = data.camera() moon = data.moon() @@ -125,7 +124,7 @@ def test_label_painter(): assert_equal(lp.paint_tool.shape, moon.shape) -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_crop(): image = data.camera() viewer = ImageViewer(image) @@ -136,7 +135,7 @@ def test_crop(): assert_equal(viewer.image.shape, (101, 101)) -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_color_histogram(): image = skimage.img_as_float(data.load('color.png')) viewer = ImageViewer(image) @@ -148,7 +147,7 @@ def test_color_histogram(): assert_almost_equal(viewer.image.std(), 0.325, 3) -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_plot_plugin(): viewer = ImageViewer(data.moon()) plugin = PlotPlugin(image_filter=lambda x: x) @@ -160,7 +159,7 @@ def test_plot_plugin(): viewer.close() -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_plugin(): img = skimage.img_as_float(data.moon()) viewer = ImageViewer(img) diff --git a/skimage/viewer/tests/test_tools.py b/skimage/viewer/tests/test_tools.py index 8cffd323..9f02e762 100644 --- a/skimage/viewer/tests/test_tools.py +++ b/skimage/viewer/tests/test_tools.py @@ -11,10 +11,9 @@ try: from skimage.viewer.canvastools import ( LineTool, ThickLineTool, RectangleTool, PaintTool) from skimage.viewer.canvastools.base import CanvasToolBase + viewer_available = not qt_api is None except ImportError: - skip_all = True -else: - skip_all = False + viewer_available = False def get_end_points(image): @@ -76,7 +75,7 @@ def create_mouse_event(ax, button=1, xdata=0, ydata=0, key=None): return event -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_line_tool(): img = data.camera() viewer = ImageViewer(img) @@ -102,7 +101,7 @@ def test_line_tool(): assert_equal(tool.geometry, np.array([[100, 100], [10, 10]])) -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_thick_line_tool(): img = data.camera() viewer = ImageViewer(img) @@ -127,7 +126,7 @@ def test_thick_line_tool(): assert_equal(tool.linewidth, 1) -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_rect_tool(): img = data.camera() viewer = ImageViewer(img) @@ -159,7 +158,7 @@ def test_rect_tool(): assert_equal(tool.geometry, [10, 100, 10, 100]) -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_paint_tool(): img = data.moon() viewer = ImageViewer(img) @@ -195,7 +194,7 @@ def test_paint_tool(): assert_equal(tool.overlay.sum(), 0) -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_base_tool(): img = data.moon() viewer = ImageViewer(img) diff --git a/skimage/viewer/tests/test_viewer.py b/skimage/viewer/tests/test_viewer.py index 2a232b29..cd6c7acb 100644 --- a/skimage/viewer/tests/test_viewer.py +++ b/skimage/viewer/tests/test_viewer.py @@ -10,13 +10,12 @@ try: from skimage.viewer.plugins import OverlayPlugin from skimage.viewer.plugins.overlayplugin import recent_mpl_version from skimage.viewer import ImageViewer, CollectionViewer + viewer_available = not qt_api is None except ImportError: - skip_all = True -else: - skip_all = False + viewer_available = False -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_viewer(): lena = data.lena() coins = data.coins() @@ -43,7 +42,7 @@ def make_key_event(key): QtCore.Qt.NoModifier) -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_collection_viewer(): img = data.lena() @@ -59,7 +58,7 @@ def test_collection_viewer(): view._format_coord(10, 10) -@skipif(skip_all or qt_api is None or not recent_mpl_version()) +@skipif(not viewer_available or not recent_mpl_version()) def test_viewer_with_overlay(): img = data.coins() ov = OverlayPlugin(image_filter=sobel) diff --git a/skimage/viewer/tests/test_widgets.py b/skimage/viewer/tests/test_widgets.py index 3a29c4ba..aeb4ede2 100644 --- a/skimage/viewer/tests/test_widgets.py +++ b/skimage/viewer/tests/test_widgets.py @@ -10,10 +10,9 @@ try: from skimage.viewer.widgets import ( Slider, OKCancelButtons, SaveButtons, ComboBox, Text) from skimage.viewer.plugins.base import Plugin + viewer_available = not qt_api is None except ImportError: - skip_all = True -else: - skip_all = False + viewer_available = False def get_image_viewer(): @@ -23,7 +22,7 @@ def get_image_viewer(): return viewer -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_combo_box(): viewer = get_image_viewer() cb = ComboBox('hello', ('a', 'b', 'c')) @@ -36,7 +35,7 @@ def test_combo_box(): assert_equal(cb.index, 2) -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_text_widget(): viewer = get_image_viewer() txt = Text('hello', 'hello, world!') @@ -47,7 +46,7 @@ def test_text_widget(): assert_equal(str(txt.text), 'goodbye, world!') -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_slider_int(): viewer = get_image_viewer() sld = Slider('radius', 2, 10, value_type='int') @@ -61,7 +60,7 @@ def test_slider_int(): assert_equal(sld.val, 5) -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_slider_float(): viewer = get_image_viewer() sld = Slider('alpha', 2.1, 3.1, value=2.1, value_type='float', @@ -76,7 +75,7 @@ def test_slider_float(): assert_almost_equal(sld.val, 2.5, 2) -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_save_buttons(): viewer = get_image_viewer() sv = SaveButtons() @@ -99,7 +98,7 @@ def test_save_buttons(): assert_almost_equal(img, viewer.image) -@skipif(skip_all or qt_api is None) +@skipif(not viewer_available) def test_ok_buttons(): viewer = get_image_viewer() ok = OKCancelButtons()