fix: cleaned up nipype testing framework

Author: satra

nipype/__init__.py

@@ -13,53 +13,38 @@
 
 from distutils.version import LooseVersion
 
-try:
-    from numpy.testing import nosetester
+from .fixes.numpy.testing import nosetester
 
-    class _NoseTester(nosetester.NoseTester):
-        """ Subclass numpy's NoseTester to add doctests by default
-        """
+class _NoseTester(nosetester.NoseTester):
+    """ Subclass numpy's NoseTester to add doctests by default
+    """
 
-        def _get_custom_doctester(self):
-            return None
-
-        def prepare_test_args(self, label='fast', verbose=1, extra_argv=None,
-                          doctests=False, coverage=False):
-            argv, plugins = super(_NoseTester, self).prepare_test_args(label=label,
-                                                 verbose=verbose,
-                                                 extra_argv=extra_argv,
-                                                 doctests=doctests,
-                                                 coverage=coverage)
-            if doctests and '--with-numpydoctest' in argv:
-                numpydocindex = argv.index('--with-numpydoctest')
-                argv[numpydocindex] = '--with-doctest'
-            return argv, plugins
-
-        def test(self, label='fast', verbose=1, extra_argv=['--exe'],
-                 doctests=True, coverage=False):
-            """Run the full test suite
-
-            Examples
-            --------
-            This will run the test suite and stop at the first failing
-            example
-            >>> from nipype import test
-            >>> test(extra_argv=['--exe', '-sx']) #doctest: +SKIP
-            """
-            return super(_NoseTester, self).test(label=label,
-                                                 verbose=verbose,
-                                                 extra_argv=extra_argv,
-                                                 doctests=doctests,
-                                                 coverage=coverage)
+    def _get_custom_doctester(self):
+        return None
 
-    try:
-        test = _NoseTester(raise_warnings="release").test
-    except TypeError:
-        # Older versions of numpy do not have a raise_warnings argument
-        test = _NoseTester().test
-    del nosetester
-except:
-    pass
+    def test(self, label='fast', verbose=1, extra_argv=['--exe'],
+             doctests=True, coverage=False):
+        """Run the full test suite
+
+        Examples
+        --------
+        This will run the test suite and stop at the first failing
+        example
+        >>> from nipype import test
+        >>> test(extra_argv=['--exe', '-sx']) #doctest: +SKIP
+        """
+        return super(_NoseTester, self).test(label=label,
+                                             verbose=verbose,
+                                             extra_argv=extra_argv,
+                                             doctests=doctests,
+                                             coverage=coverage)
+
+try:
+    test = _NoseTester(raise_warnings="release").test
+except TypeError:
+    # Older versions of numpy do not have a raise_warnings argument
+    test = _NoseTester().test
+del nosetester
 
 
 def _test_local_install():

nipype/testing/__init__.py

@@ -12,15 +12,6 @@
    for running the algorithms in the NIPY library.  This file should
    import without nose being present on the python path.
 
-Examples
---------
-
->>> from nipy.testing import funcfile
->>> from nipy.io.api import load_image
->>> img = load_image(funcfile)
->>> img.shape
-(17, 21, 3, 20)
-
 """
 
 import os
@@ -37,11 +28,6 @@
 from nose.tools import *
 from numpy.testing import *
 
-# Overwrites numpy.testing.Tester
-from .nosetester import NipyNoseTester as Tester
-test = Tester().test
-bench = Tester().bench
-
 from . import decorators as dec
 from .utils import skip_if_no_package, package_check
 
@@ -58,10 +44,3 @@ def example_data(infile='functional.nii'):
         raise IOError('%s empty data file does NOT exist'%(outfile))
 
     return outfile
-
-# Allow failed import of nose if not now running tests
-try:
-    from nose.tools import assert_true, assert_false
-    from lightunit import ParametricTestCase, parametric
-except ImportError:
-    pass