DEP: Transition checkwarns to deprecations and set target version

Author: effigies

nibabel/checkwarns.py

@@ -13,25 +13,20 @@
 import warnings
 
 from .testing import (error_warnings, suppress_warnings)
+from .deprecated import deprecate_with_version
 
 
 warnings.warn('The checkwarns module is deprecated and will be removed '
-              'in nibabel v3.0', FutureWarning)
+              'in nibabel v3.0', DeprecationWarning)
 
 
+@deprecate_with_version('ErrorWarnings is deprecated; use nibabel.testing.error_warnings.',
+                        since='2.1.0', until='3.0.0')
 class ErrorWarnings(error_warnings):
-
-    def __init__(self, *args, **kwargs):
-        warnings.warn('ErrorWarnings is deprecated and will be removed in '
-                      'nibabel v3.0; use nibabel.testing.error_warnings.',
-                      FutureWarning)
-        super(ErrorWarnings, self).__init__(*args, **kwargs)
+    pass
 
 
+@deprecate_with_version('IgnoreWarnings is deprecated; use nibabel.testing.suppress_warnings.',
+                        since='2.1.0', until='3.0.0')
 class IgnoreWarnings(suppress_warnings):
-
-    def __init__(self, *args, **kwargs):
-        warnings.warn('IgnoreWarnings is deprecated and will be removed in '
-                      'nibabel v3.0; use nibabel.testing.suppress_warnings.',
-                      FutureWarning)
-        super(IgnoreWarnings, self).__init__(*args, **kwargs)
+    pass

nibabel/tests/test_checkwarns.py

@@ -1,21 +1,14 @@
 """ Tests for warnings context managers
 """
-from __future__ import division, print_function, absolute_import
-
-from nose.tools import assert_equal
-from ..testing import clear_and_catch_warnings, suppress_warnings
+from ..testing import assert_equal, assert_warns, suppress_warnings
 
 
 def test_ignore_and_error_warnings():
     with suppress_warnings():
         from .. import checkwarns
 
-    with clear_and_catch_warnings() as w:
+    with assert_warns(DeprecationWarning):
         checkwarns.IgnoreWarnings()
-        assert_equal(len(w), 1)
-        assert_equal(w[0].category, FutureWarning)
 
-    with clear_and_catch_warnings() as w:
+    with assert_warns(DeprecationWarning):
         checkwarns.ErrorWarnings()
-        assert_equal(len(w), 1)
-        assert_equal(w[0].category, FutureWarning)