From beb395abbbb4003d71b36c87501ec9058e25c276 Mon Sep 17 00:00:00 2001 From: JDWarner Date: Wed, 20 Nov 2013 12:29:45 -0600 Subject: [PATCH] FIX: Skip `viewer.show()` commands which hang Travis --- skimage/viewer/plugins/base.py | 2 +- skimage/viewer/viewers/core.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/viewer/plugins/base.py b/skimage/viewer/plugins/base.py index 6aa37947..d3122e89 100644 --- a/skimage/viewer/plugins/base.py +++ b/skimage/viewer/plugins/base.py @@ -66,7 +66,7 @@ class Plugin(QtGui.QDialog): >>> image = data.coins() >>> viewer = ImageViewer(image) # skip if not has_qt >>> viewer += plugin # skip if not has_qt - >>> viewer.show() # skip if not has_qt + >>> viewer.show() # doctest: +SKIP The plugin will automatically delegate parameters to `image_filter` based on its parameter type, i.e., `ptype` (widgets for required arguments must diff --git a/skimage/viewer/viewers/core.py b/skimage/viewer/viewers/core.py index 1bf53f64..1928a178 100644 --- a/skimage/viewer/viewers/core.py +++ b/skimage/viewer/viewers/core.py @@ -80,7 +80,7 @@ class ImageViewer(QtGui.QMainWindow): >>> from skimage import data >>> image = data.coins() >>> viewer = ImageViewer(image) # skip if not has_qt - >>> viewer.show() # skip if not has_qt + >>> viewer.show() # doctest: +SKIP """