removed references to nose and fixed exception discrepancy between Py2 and Py3

Author: satra

nipype/pipeline/engine/nodes.py

@@ -1129,7 +1129,10 @@ def _node_runner(self, nodes, updatehash=False):
             try:
                 node.run(updatehash=updatehash)
             except Exception as e:
-                err = str(e)
+                if sys.version < 3:
+                    err = e
+                else:
+                    err = str(e)
                 if str2bool(self.config['execution']['stop_on_first_crash']):
                     raise
             finally:

nipype/pipeline/engine/tests/__init__.py

@@ -1,6 +1,3 @@
 # -*- coding: utf-8 -*-
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
-
-from nipype.testing import skip_if_no_package
-skip_if_no_package('networkx', '1.0')

nipype/pipeline/engine/tests/test_utils.py

@@ -384,6 +384,7 @@ def myfunction(string):
 
 def test_mapnode_crash3(tmpdir):
     """Test mapnode crash when mapnode is embedded in a workflow"""
+
     def myfunction(string):
         return string + 'meh'
     node = pe.MapNode(niu.Function(input_names=['WRONG'],
@@ -393,7 +394,8 @@ def myfunction(string):
                       name='myfunc')
 
     node.inputs.WRONG = ['string' + str(i) for i in range(3)]
-    wf = pe.Workflow('test_mapnode_crash')
+    wf = pe.Workflow('testmapnodecrash')
+    wf.config['crashdump_dir'] = str(tmpdir)
     wf.add_nodes([node])
     wf.base_dir = str(tmpdir)
 

nipype/testing/README

@@ -2,17 +2,7 @@
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
 """The testing directory contains a small set of imaging files to be
-used for doctests only.  More thorough tests and example data will be
-stored in a nipy data packages that you can download separately.
-
-.. note:
-
-   We use the ``nose`` testing framework for tests.
-
-   Nose is a dependency for the tests, but should not be a dependency
-   for running the algorithms in the NIPY library.  This file should
-   import without nose being present on the python path.
-
+used for doctests only.
 """
 
 import os
@@ -28,7 +18,7 @@
 
 
 from . import decorators as dec
-from .utils import skip_if_no_package, package_check, TempFATFS
+from .utils import package_check, TempFATFS
 
 skipif = dec.skipif
 

nipype/testing/__init__.py

@@ -13,7 +13,6 @@
 import subprocess
 from subprocess import CalledProcessError
 from tempfile import mkdtemp
-from nose import SkipTest
 from future.utils import raise_from
 from ..utils.misc import package_check
 
@@ -22,18 +21,6 @@
 import numpy as np
 import nibabel as nb
 
-def skip_if_no_package(*args, **kwargs):
-    """Raise SkipTest if package_check fails
-
-    Parameters
-    ----------
-    *args Positional parameters passed to `package_check`
-    *kwargs Keyword parameters passed to `package_check`
-    """
-    package_check(exc_failed_import=SkipTest,
-                  exc_failed_check=SkipTest,
-                  *args, **kwargs)
-
 
 class TempFATFS(object):
     def __init__(self, size_in_mbytes=8, delay=0.5):