diff --git a/skimage/_shared/tests/__init__.py b/skimage/_shared/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/_shared/tests/__init__.py +++ b/skimage/_shared/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/color/tests/__init__.py b/skimage/color/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/color/tests/__init__.py +++ b/skimage/color/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/data/tests/__init__.py b/skimage/data/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/data/tests/__init__.py +++ b/skimage/data/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/draw/tests/__init__.py b/skimage/draw/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/draw/tests/__init__.py +++ b/skimage/draw/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/exposure/tests/__init__.py b/skimage/exposure/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/exposure/tests/__init__.py +++ b/skimage/exposure/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/feature/tests/__init__.py b/skimage/feature/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/feature/tests/__init__.py +++ b/skimage/feature/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/filters/rank/tests/__init__.py b/skimage/filters/rank/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/filters/rank/tests/__init__.py +++ b/skimage/filters/rank/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/filters/rank/tests/test_rank.py b/skimage/filters/rank/tests/test_rank.py index f491881d..64c3ca97 100644 --- a/skimage/filters/rank/tests/test_rank.py +++ b/skimage/filters/rank/tests/test_rank.py @@ -156,9 +156,9 @@ def test_bitdepth(): for i in range(5): image = np.ones((100, 100), dtype=np.uint16) * 255 * 2 ** i if i > 3: - expected = ["Bitdepth of"] + expected = ["Bitdepth of"] else: - expected = [] + expected = [] with expected_warnings(expected): rank.mean_percentile(image=image, selem=elem, mask=mask, out=out, shift_x=0, shift_y=0, p0=.1, p1=.9) @@ -523,9 +523,9 @@ def test_16bit(): value = 2 ** bitdepth - 1 image[10, 10] = value if bitdepth > 11: - expected = ['Bitdepth of %s' % (bitdepth - 1)] + expected = ['Bitdepth of %s' % (bitdepth - 1)] else: - expected = [] + expected = [] with expected_warnings(expected): assert rank.minimum(image, selem)[10, 10] == 0 assert rank.maximum(image, selem)[10, 10] == value diff --git a/skimage/filters/tests/__init__.py b/skimage/filters/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/filters/tests/__init__.py +++ b/skimage/filters/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/graph/tests/__init__.py b/skimage/graph/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/graph/tests/__init__.py +++ b/skimage/graph/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/io/tests/__init__.py b/skimage/io/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/io/tests/__init__.py +++ b/skimage/io/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/measure/tests/__init__.py b/skimage/measure/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/measure/tests/__init__.py +++ b/skimage/measure/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/measure/tests/test_regionprops.py b/skimage/measure/tests/test_regionprops.py index fdbabad9..5a14aba5 100644 --- a/skimage/measure/tests/test_regionprops.py +++ b/skimage/measure/tests/test_regionprops.py @@ -33,7 +33,7 @@ def test_dtype(): regionprops(np.zeros((10, 10), dtype=np.int)) regionprops(np.zeros((10, 10), dtype=np.uint)) assert_raises((TypeError, RuntimeError), regionprops, - np.zeros((10, 10), dtype=np.double)) + np.zeros((10, 10), dtype=np.double)) def test_ndim(): diff --git a/skimage/morphology/tests/__init__.py b/skimage/morphology/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/morphology/tests/__init__.py +++ b/skimage/morphology/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/novice/tests/__init__.py b/skimage/novice/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/novice/tests/__init__.py +++ b/skimage/novice/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/restoration/tests/__init__.py b/skimage/restoration/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/restoration/tests/__init__.py +++ b/skimage/restoration/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/segmentation/tests/__init__.py b/skimage/segmentation/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/segmentation/tests/__init__.py +++ b/skimage/segmentation/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/transform/tests/__init__.py b/skimage/transform/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/transform/tests/__init__.py +++ b/skimage/transform/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/util/tests/__init__.py b/skimage/util/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/util/tests/__init__.py +++ b/skimage/util/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test() diff --git a/skimage/viewer/tests/__init__.py b/skimage/viewer/tests/__init__.py index 9c11267a..3df53221 100644 --- a/skimage/viewer/tests/__init__.py +++ b/skimage/viewer/tests/__init__.py @@ -5,5 +5,5 @@ def setup(): setup_test() -def tearDown(): +def teardown(): teardown_test()