Merge pull request #738 from yarikoptic/enh-deprec-numpy.testing.decorators

RF: Centralize import of decorators from numpy.testing

Author: effigies

nibabel/nicom/tests/test_csareader.py

@@ -12,7 +12,7 @@
 
 from nose.tools import (assert_true, assert_false, assert_equal, assert_raises)
 
-from numpy.testing.decorators import skipif
+from ...testing import skipif
 
 from nibabel.pydicom_compat import dicom_test, pydicom
 from .test_dicomwrappers import (IO_DATA_PATH, DATA)

nibabel/testing/__init__.py

@@ -17,12 +17,10 @@
 
 import numpy as np
 from numpy.testing import assert_array_equal
+from numpy.testing import dec
+skipif = dec.skipif
+slow = dec.slow
 
-try:
-    from numpy.testing import dec
-    skipif = dec.skipif
-except ImportError:
-    from numpy.testing.decorators import skipif
 # Allow failed import of nose if not now running tests
 try:
     from nose.tools import (assert_equal, assert_not_equal,

nibabel/tests/nibabel_data.py

@@ -4,7 +4,7 @@
 from os import environ, listdir
 from os.path import dirname, realpath, join as pjoin, isdir, exists
 
-from numpy.testing.decorators import skipif
+from ..testing import skipif
 
 
 def get_nibabel_data():

nibabel/tests/test_processing.py

@@ -30,7 +30,7 @@
 
 from numpy.testing import (assert_almost_equal,
                            assert_array_equal)
-from numpy.testing.decorators import skipif
+from ..testing import skipif
 
 from nose.tools import (assert_true, assert_false, assert_raises,
                         assert_equal, assert_not_equal)

nibabel/tests/test_quaternions.py

@@ -11,14 +11,7 @@
 import numpy as np
 from numpy import pi
 
-# Recent (1.2) versions of numpy have this decorator
-try:
-    from numpy.testing.decorators import slow
-except ImportError:
-    def slow(t):
-        t.slow = True
-        return t
-
+from ..testing import slow
 from nose.tools import assert_raises, assert_true, assert_false, \
     assert_equal
 

nibabel/tests/test_viewers.py

@@ -14,7 +14,7 @@
 from ..optpkg import optional_package
 from ..viewers import OrthoSlicer3D
 
-from numpy.testing.decorators import skipif
+from ..testing import skipif
 from numpy.testing import assert_array_equal, assert_equal
 
 from nose.tools import assert_raises, assert_true