Merge branch 'master' of https://github.com/nipy/nipype

Author: Joerg Stadler

.circleci/config.yml

@@ -1,5 +1,5 @@
 _machine_kwds: &machine_kwds
-  image: circleci/classic:201710-02
+  image: circleci/classic:201808-01
 
 _store_artifacts_kwds: &store_artifacts_kwds
   path: /home/circleci/work/tests
@@ -356,6 +356,16 @@ jobs:
             pip install dist/nipype-*-py2.py3-none-any.whl
             # Futures should not install in Python 3
             test $(pip show futures 2>/dev/null | wc -l) = "0"
+      - run:
+          name: Validate Python 3.7 installation
+          command: |
+            pyenv local 3.7.0
+            pip install --upgrade pip
+            # Pre-install a version of numpy that will not pass
+            pip install numpy==1.15.0
+            pip install dist/nipype-*-py2.py3-none-any.whl
+            # Numpy should be upgraded to >= 1.15.3
+            test "$(pip show numpy | grep Version)" \> "Version: 1.15.2"
       - store_artifacts:
           path: /home/circleci/nipype/dist
 

.mailmap

@@ -3,6 +3,7 @@ Aimi Watanabe <watanabe.aimi@gmail.com> stymy <watanabe.aimi@gmail.com>
 Alejandro Tabas <alextabas@gmail.com> qTabs <qtabas@gmail.com>
 Alejandro Tabas <alextabas@gmail.com> qtabs <alextabas@gmail.com>
 Alejandro de la Vega <aleph4@gmail.com> adelavega <delavega@utexas.edu>
+Alejandro de la Vega <aleph4@gmail.com> delavega4 <aleph4@gmail.com>
 Alexander Schaefer <alexschaefer83@gmail.com> Alexander Schaefer <aschaefer@melisse.cbs.mpg.de>
 Alexander Schaefer <alexschaefer83@gmail.com> alexschaefer83 <alexschaefer83@gmail.com>
 Alexander Schaefer <alexschaefer83@gmail.com> aschaefer <aschaefer@aschaefer-U36SD.(none)>
@@ -40,6 +41,7 @@ Christopher J. Markiewicz <effigies@gmail.com> Chris Markiewicz <effigies@gmail.
 Christopher J. Markiewicz <effigies@gmail.com> Christopher J. Johnson <effigies@gmail.com>
 Christopher J. Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <effigies@bu.edu>
 Christopher J. Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <markiewicz@stanford.edu>
+Christopher J. Markiewicz <effigies@gmail.com> Chris Markiewicz <markiewicz@stanford.edu>
 Cindee Madison <cindee@berkeley.edu> cindeem
 Cindee Madison <cindee@berkeley.edu> cindeem <>
 Colin Buchanan <colinrbuchanan@gmail.com> Colin Buchanan <cbuchanan@cray4.(none)>
@@ -62,6 +64,7 @@ Erik Ziegler <erik.sweed@gmail.com> Erik Ziegler <erik.ziegler@ulg.ac.be>
 Erik Ziegler <erik.sweed@gmail.com> erik <erik@erik-ubuntu.(none)>
 Erik Ziegler <erik.sweed@gmail.com> erikz <erik.ziegler@ulg.ac.be>
 Erik Ziegler <erik.sweed@gmail.com> swederik <erik.sweed@gmail.com>
+Feilong Ma <mafeilong@gmail.com> Ma Feilong <mafeilong@gmail.com>
 Fernando Pérez-García <fepegar@gmail.com> Fernando <fepegar@gmail.com>
 Franz Liem <franz.liem@gmail.com> fliem <franz.liem>
 Franz Liem <franz.liem@gmail.com> fliem <franz.liem@gmail.com>
@@ -93,7 +96,7 @@ Josh Warner <silvertrumpet999+github@gmail.com> JDWarner <warner.joshua@mayo.edu
 Josh Warner <silvertrumpet999+github@gmail.com> Josh Warner (Mac) <warner.joshua@mayo.edu>
 Kai Schlamp <schlamp@gmx.de> medihack <schlamp@gmx.de>Jessica Forbes <jessica-forbes@uiowa.edu> jessicaforbes <jessica-forbes@uiowa.edu>
 Katie Bottenhorn <kbott006@fiu.edu> 62442katieb <kbott006@fiu.edu>
-Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <Kesshi.Jordan@ucsf.edu> 
+Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <Kesshi.Jordan@ucsf.edu>
 Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <kesshi.jordan@gmail.com>
 Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <kesshijordan@D-108-179-130-38.dhcp4.washington.edu>
 Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <kesshijordan@D-69-91-152-99.dhcp4.washington.edu>

.travis.yml

@@ -60,6 +60,9 @@ matrix:
           NIPYPE_EXTRAS="doc,tests,nipy,profiler"
           EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS"
           CI_SKIP_TEST=1
+  allow_failures:
+    - python: 2.7
+      env: INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,nipy,profiler" EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS" CI_SKIP_TEST=1
 
 addons:
   apt:
@@ -86,14 +89,15 @@ before_install:
   fi;
 
 - travis_retry pip install -r requirements.txt
-- travis_retry pip install grabbit==0.1.2
-- travis_retry git clone -b 0.6.5 https://github.com/INCF/pybids.git ${HOME}/pybids && pip install -e ${HOME}/pybids
+- travis_retry pip install grabbit==0.2.6
+- travis_retry pip install -e git+https://github.com/bids-standard/pybids.git@0.7.0#egg=pybids
 
 install:
 - travis_retry pip install $EXTRA_PIP_FLAGS -e .[$NIPYPE_EXTRAS]
+- travis_retry pip install pytest-xdist
 
 script:
-- py.test -v --cov nipype --cov-config .coveragerc --cov-report xml:cov.xml -c nipype/pytest.ini --doctest-modules nipype
+- py.test -v --cov nipype --cov-config .coveragerc --cov-report xml:cov.xml -c nipype/pytest.ini --doctest-modules nipype -n auto
 
 after_script:
 - codecov --file cov.xml --flags unittests -e TRAVIS_JOB_NUMBER