From 85a68cff2870e991f47aedb42cdd0c1b68125d61 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 3 Feb 2015 21:10:30 -0600 Subject: [PATCH 1/4] Cannot use bare deprecated decorator --- skimage/filter/__init__.py | 2 +- skimage/filters/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/filter/__init__.py b/skimage/filter/__init__.py index 5d43f69d..0763567a 100644 --- a/skimage/filter/__init__.py +++ b/skimage/filter/__init__.py @@ -36,7 +36,7 @@ denoise_tv_chambolle = deprecated('skimage.restoration.denoise_tv_chambolle')\ (restoration.denoise_tv_chambolle) # Backward compatibility v<0.11 -@deprecated +@deprecated() def canny(*args, **kwargs): # Hack to avoid circular import from skimage.feature._canny import canny as canny_ diff --git a/skimage/filters/__init__.py b/skimage/filters/__init__.py index aeba00f7..edf37ee9 100644 --- a/skimage/filters/__init__.py +++ b/skimage/filters/__init__.py @@ -23,7 +23,7 @@ denoise_tv_chambolle = deprecated('skimage.restoration.denoise_tv_chambolle')\ (restoration.denoise_tv_chambolle) # Backward compatibility v<0.11 -@deprecated +@deprecated() def canny(*args, **kwargs): # Hack to avoid circular import from ..feature._canny import canny as canny_ From 69c0fd5e4678518f42738244253dd26d8bf363bb Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 3 Feb 2015 21:34:25 -0600 Subject: [PATCH 2/4] Give an alternate canny location --- skimage/filter/__init__.py | 2 +- skimage/filters/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/filter/__init__.py b/skimage/filter/__init__.py index 0763567a..8b81c254 100644 --- a/skimage/filter/__init__.py +++ b/skimage/filter/__init__.py @@ -36,7 +36,7 @@ denoise_tv_chambolle = deprecated('skimage.restoration.denoise_tv_chambolle')\ (restoration.denoise_tv_chambolle) # Backward compatibility v<0.11 -@deprecated() +@deprecated('skimage.feature.canny') def canny(*args, **kwargs): # Hack to avoid circular import from skimage.feature._canny import canny as canny_ diff --git a/skimage/filters/__init__.py b/skimage/filters/__init__.py index edf37ee9..795819c6 100644 --- a/skimage/filters/__init__.py +++ b/skimage/filters/__init__.py @@ -23,7 +23,7 @@ denoise_tv_chambolle = deprecated('skimage.restoration.denoise_tv_chambolle')\ (restoration.denoise_tv_chambolle) # Backward compatibility v<0.11 -@deprecated() +@deprecated('skimage.feature.canny') def canny(*args, **kwargs): # Hack to avoid circular import from ..feature._canny import canny as canny_ From d070b2df4dbed6d28af4bce973c305a103165f1f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 3 Feb 2015 21:39:23 -0600 Subject: [PATCH 3/4] Add an explicit test for canny deprecation --- ...{test_filter_import.py => test_deprecated_imports.py} | 9 +++++++++ 1 file changed, 9 insertions(+) rename skimage/filters/tests/{test_filter_import.py => test_deprecated_imports.py} (55%) diff --git a/skimage/filters/tests/test_filter_import.py b/skimage/filters/tests/test_deprecated_imports.py similarity index 55% rename from skimage/filters/tests/test_filter_import.py rename to skimage/filters/tests/test_deprecated_imports.py index 90384324..c969be5a 100644 --- a/skimage/filters/tests/test_filter_import.py +++ b/skimage/filters/tests/test_deprecated_imports.py @@ -8,3 +8,12 @@ def test_filter_import(): assert('sobel' in dir(F)) assert F._import_warned + + +def test_canny_import(): + with catch_warnings(): + simplefilter('ignore') + from skimage.filters import canny + + assert('canny' in dir(F)) + assert F._import_warned From f4970f9707738dfd5e5098bb41d868f9b6fc2fe8 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 3 Feb 2015 21:47:56 -0600 Subject: [PATCH 4/4] Fix canny import test --- skimage/filters/tests/test_deprecated_imports.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/skimage/filters/tests/test_deprecated_imports.py b/skimage/filters/tests/test_deprecated_imports.py index c969be5a..2ea21ca2 100644 --- a/skimage/filters/tests/test_deprecated_imports.py +++ b/skimage/filters/tests/test_deprecated_imports.py @@ -1,4 +1,6 @@ from warnings import catch_warnings, simplefilter +from ..._shared._warnings import expected_warnings +from ...data import moon def test_filter_import(): @@ -11,9 +13,7 @@ def test_filter_import(): def test_canny_import(): - with catch_warnings(): - simplefilter('ignore') + data = moon() + with expected_warnings(['skimage.feature.canny']): from skimage.filters import canny - - assert('canny' in dir(F)) - assert F._import_warned + canny(data)