From f72882fbd24252d6e1bd71dfa0765a380e9c6b2d Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 21 Dec 2014 14:43:49 -0600 Subject: [PATCH] Import scipy before turning on warnings --- skimage/_shared/tests/__init__.py | 1 + skimage/color/tests/__init__.py | 1 + skimage/data/tests/__init__.py | 1 + skimage/draw/tests/__init__.py | 1 + skimage/exposure/tests/__init__.py | 1 + skimage/feature/tests/__init__.py | 1 + skimage/filters/__init__.py | 5 ----- skimage/filters/rank/tests/__init__.py | 1 + skimage/filters/tests/__init__.py | 1 + skimage/graph/tests/__init__.py | 1 + skimage/io/tests/__init__.py | 1 + skimage/morphology/tests/__init__.py | 1 + skimage/novice/tests/__init__.py | 1 + skimage/restoration/tests/__init__.py | 1 + skimage/segmentation/tests/__init__.py | 1 + skimage/transform/tests/__init__.py | 1 + skimage/util/tests/__init__.py | 1 + skimage/viewer/tests/__init__.py | 1 + 18 files changed, 17 insertions(+), 5 deletions(-) diff --git a/skimage/_shared/tests/__init__.py b/skimage/_shared/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/_shared/tests/__init__.py +++ b/skimage/_shared/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/color/tests/__init__.py b/skimage/color/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/color/tests/__init__.py +++ b/skimage/color/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/data/tests/__init__.py b/skimage/data/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/data/tests/__init__.py +++ b/skimage/data/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/draw/tests/__init__.py b/skimage/draw/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/draw/tests/__init__.py +++ b/skimage/draw/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/exposure/tests/__init__.py b/skimage/exposure/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/exposure/tests/__init__.py +++ b/skimage/exposure/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/feature/tests/__init__.py b/skimage/feature/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/feature/tests/__init__.py +++ b/skimage/feature/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/filters/__init__.py b/skimage/filters/__init__.py index d1c23caf..169b4132 100644 --- a/skimage/filters/__init__.py +++ b/skimage/filters/__init__.py @@ -1,8 +1,3 @@ -from skimage._shared.utils import all_warnings -with all_warnings(): # suppress warnings when importing scipy - import scipy.ndimage as _ndimage - del _ndimage - from .lpi_filter import inverse, wiener, LPIFilter2D from ._gaussian import gaussian_filter from .edges import (sobel, hsobel, vsobel, sobel_h, sobel_v, diff --git a/skimage/filters/rank/tests/__init__.py b/skimage/filters/rank/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/filters/rank/tests/__init__.py +++ b/skimage/filters/rank/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/filters/tests/__init__.py b/skimage/filters/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/filters/tests/__init__.py +++ b/skimage/filters/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/graph/tests/__init__.py b/skimage/graph/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/graph/tests/__init__.py +++ b/skimage/graph/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/io/tests/__init__.py b/skimage/io/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/io/tests/__init__.py +++ b/skimage/io/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/morphology/tests/__init__.py b/skimage/morphology/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/morphology/tests/__init__.py +++ b/skimage/morphology/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/novice/tests/__init__.py b/skimage/novice/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/novice/tests/__init__.py +++ b/skimage/novice/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/restoration/tests/__init__.py b/skimage/restoration/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/restoration/tests/__init__.py +++ b/skimage/restoration/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/segmentation/tests/__init__.py b/skimage/segmentation/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/segmentation/tests/__init__.py +++ b/skimage/segmentation/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/transform/tests/__init__.py b/skimage/transform/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/transform/tests/__init__.py +++ b/skimage/transform/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/util/tests/__init__.py b/skimage/util/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/util/tests/__init__.py +++ b/skimage/util/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error') diff --git a/skimage/viewer/tests/__init__.py b/skimage/viewer/tests/__init__.py index 0922ce59..9b8945a5 100644 --- a/skimage/viewer/tests/__init__.py +++ b/skimage/viewer/tests/__init__.py @@ -1,2 +1,3 @@ import warnings +from scipy import ndimage, special, optimize warnings.simplefilter('error')