From d37ccca5985f1201828cf32527feba7466f48b8b Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 24 Dec 2014 06:54:56 -0600 Subject: [PATCH] Fix Py2.7 build errors --- skimage/_shared/testing.py | 3 +-- skimage/exposure/tests/test_exposure.py | 2 +- skimage/filters/rank/tests/test_rank.py | 2 +- skimage/morphology/tests/test_grey.py | 8 ++++---- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/skimage/_shared/testing.py b/skimage/_shared/testing.py index 1c95644b..d012b8b6 100644 --- a/skimage/_shared/testing.py +++ b/skimage/_shared/testing.py @@ -190,8 +190,7 @@ def setup_test(): from scipy.io import loadmat from skimage import viewer, filter np.random.seed(0) - if os.environ.get('TRAVIS_PYTHON_VERSION', None) != '2.7': - warnings.simplefilter('error') + warnings.simplefilter('error') def teardown_test(): diff --git a/skimage/exposure/tests/test_exposure.py b/skimage/exposure/tests/test_exposure.py index 5a3d3dba..6e93d1af 100644 --- a/skimage/exposure/tests/test_exposure.py +++ b/skimage/exposure/tests/test_exposure.py @@ -211,7 +211,7 @@ def test_adapthist_grayscale(): img = skimage.img_as_float(data.astronaut()) img = rgb2gray(img) img = np.dstack((img, img, img)) - with expected_warnings(['precision loss']): + with expected_warnings(['precision loss|non-contiguous input]): adapted = exposure.equalize_adapthist(img, 10, 9, clip_limit=0.01, nbins=128) assert_almost_equal = np.testing.assert_almost_equal diff --git a/skimage/filters/rank/tests/test_rank.py b/skimage/filters/rank/tests/test_rank.py index 5cf5a091..f491881d 100644 --- a/skimage/filters/rank/tests/test_rank.py +++ b/skimage/filters/rank/tests/test_rank.py @@ -11,7 +11,7 @@ from skimage._shared._warnings import expected_warnings def test_all(): - with expected_warnings(['precision loss', 'non-integer']): + with expected_warnings(['precision loss', 'non-integer|\A\Z']): check_all() diff --git a/skimage/morphology/tests/test_grey.py b/skimage/morphology/tests/test_grey.py index 9961b985..86ce10f5 100644 --- a/skimage/morphology/tests/test_grey.py +++ b/skimage/morphology/tests/test_grey.py @@ -172,10 +172,10 @@ def test_3d_fallback_white_tophat(): image[3, 2:5, 2:5] = 1 image[4, 3:5, 3:5] = 1 - with expected_warnings(['operator.*deprecated']): + with expected_warnings(['operator.*deprecated|\A\Z']): new_image = grey.white_tophat(image) footprint = ndimage.generate_binary_structure(3,1) - with expected_warnings(['operator.*deprecated']): + with expected_warnings(['operator.*deprecated\A\Z']): image_expected = ndimage.white_tophat(image,footprint=footprint) testing.assert_array_equal(new_image, image_expected) @@ -185,10 +185,10 @@ def test_3d_fallback_black_tophat(): image[3, 2:5, 2:5] = 0 image[4, 3:5, 3:5] = 0 - with expected_warnings(['operator.*deprecated']): + with expected_warnings(['operator.*deprecated|\A\Z']): new_image = grey.black_tophat(image) footprint = ndimage.generate_binary_structure(3,1) - with expected_warnings(['operator.*deprecated']): + with expected_warnings(['operator.*deprecated|\A\Z']): image_expected = ndimage.black_tophat(image,footprint=footprint) testing.assert_array_equal(new_image, image_expected)