RF: Drop pytest-xdist requirement, minimum pytest version

Author: effigies

nipype/__init__.py

@@ -25,16 +25,21 @@
 
 
 class NipypeTester(object):
-    def __call__(self, doctests=True, parallel=True):
+    def __call__(self, doctests=True, parallel=False):
         try:
             import pytest
-        except:
+        except ImportError:
             raise RuntimeError(
                 'py.test not installed, run: pip install pytest')
         args = []
         if not doctests:
             args.extend(['-p', 'no:doctest'])
-        if not parallel:
+        if parallel:
+            try:
+                import xdist
+            except ImportError:
+                raise RuntimeError(
+                    "pytest-xdist required for parallel run")
             args.append('-n0')
         args.append(os.path.dirname(__file__))
         pytest.main(args=args)

nipype/info.py

@@ -109,7 +109,6 @@ def get_nipype_gitversion():
 SCIPY_MIN_VERSION = '0.14'
 TRAITS_MIN_VERSION = '4.6'
 DATEUTIL_MIN_VERSION = '2.2'
-PYTEST_MIN_VERSION = '3.6'
 FUTURE_MIN_VERSION = '0.16.0'
 SIMPLEJSON_MIN_VERSION = '3.8.0'
 PROV_VERSION = '1.5.2'
@@ -160,8 +159,7 @@ def get_nipype_gitversion():
 
 TESTS_REQUIRES = [
     'mock',
-    'pytest>=%s' % PYTEST_MIN_VERSION,
-    'pytest-xdist',
+    'pytest',
     'pytest-cov',
     'codecov',
     'pytest-env',

nipype/pytest.ini

@@ -1,6 +1,6 @@
 [pytest]
 norecursedirs = .git build dist doc nipype/external tools examples src
-addopts = --doctest-modules -n auto
+addopts = --doctest-modules
 doctest_optionflags = ALLOW_UNICODE NORMALIZE_WHITESPACE
 env =
     PYTHONHASHSEED=0