enh: updated dependencies and tests for nipype

Author: satra

nipype/__init__.py

@@ -13,6 +13,7 @@
 from .utils.config import NipypeConfig
 from .utils.logger import Logging
 from .refs import due
+from .pkg_info import get_pkg_info as _get_pkg_info
 
 try:
     import faulthandler
@@ -23,49 +24,27 @@
 config = NipypeConfig()
 logging = Logging(config)
 
-#NOTE_dj: it has to be changed to python
-#class _NoseTester(nosetester.NoseTester):
-#    """ Subclass numpy's NoseTester to add doctests by default
-#    """
-
-#    def _get_custom_doctester(self):
-#        return None
 
-#    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)
+class NipypeTester(object):
+    def __call__(self, doctests=True):
+        try:
+            import pytest
+        except:
+            raise RuntimeError('py.test not installed, run: pip install pytest')
+        params = {'args': []}
+        if doctests:
+            params['args'].append('--doctest-modules')
+        nipype_path = os.path.dirname(__file__)
+        params['args'].extend(['-x', '--ignore={}/external'.format(nipype_path),
+                               nipype_path])
+        pytest.main(**params)
 
-#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
-
-# Set up package information function
-from .pkg_info import get_pkg_info as _get_pkg_info
-get_info = lambda: _get_pkg_info(os.path.dirname(__file__))
+test = NipypeTester()
 
-# If this file is exec after being imported, the following lines will
-# fail
-#try:
-#    del Tester
-#except:
-#    pass
 
+def get_info():
+    """Returns package information"""
+    return _get_pkg_info(os.path.dirname(__file__))
 
 from .pipeline import Node, MapNode, JoinNode, Workflow
 from .interfaces import (DataGrabber, DataSink, SelectFiles,

nipype/info.py

@@ -146,11 +146,11 @@ def get_nipype_gitversion():
     'xvfbwrapper',
     'funcsigs',
     'configparser',
+    'pytest>=%s' % PYTEST_MIN_VERSION
 ]
 
 TESTS_REQUIRES = [
     'pytest>=%s' % PYTEST_MIN_VERSION,
-    'pytest-raisesregexp',
     'pytest-cov',
     'mock',
     'codecov',

nipype/tests/__init__.py

@@ -0,0 +1,9 @@
+from .. import get_info
+
+def test_nipype_info():
+    exception_not_raised = True
+    try:
+        get_info()
+    except Exception as e:
+        exception_not_raised = False
+    assert exception_not_raised

nipype/tests/test_nipype.py

@@ -4,7 +4,7 @@ networkx>=1.7
 traits>=4.3
 python-dateutil>=1.5
 nibabel>=2.0.1
-future==0.15.2
+future>=0.15.2
 simplejson>=3.8.0
 prov>=1.4.0
 click>=6.6.0
@@ -13,5 +13,4 @@ psutil
 funcsigs
 configparser
 pytest>=3.0
-pytest-raisesregexp
 pytest-cov

requirements.txt

@@ -5,9 +5,8 @@ traits>=4.3
 python-dateutil>=1.5
 nibabel>=2.0.1
 pytest>=3.0
-pytest-raisesregexp
 pytest-cov
-future==0.15.2
+future>=0.15.2
 simplejson>=3.8.0
 prov>=1.4.0
 xvfbwrapper