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

Author: ostanley

.circleci/config.yml

@@ -339,20 +339,22 @@ jobs:
       - run:
           name: Check pypi preconditions
           command: |
-            pip install --upgrade twine future wheel readme_renderer setuptools
-            python setup.py check -r -s
+            pip install --upgrade pip twine future wheel readme_renderer setuptools
             python setup.py sdist bdist_wheel
+            twine check dist/*
       - run:
           name: Validate Python 2 installation
           command: |
             pyenv local 2.7.12
+            pip install --upgrade pip
             pip install dist/nipype-*-py2.py3-none-any.whl
             # Futures should install in Python 2
             pip show futures 2>/dev/null | grep "Name: futures"
       - run:
           name: Validate Python 3 installation
           command: |
             pyenv local 3.5.2
+            pip install --upgrade pip
             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"
@@ -366,6 +368,14 @@ jobs:
             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"
+      - run:
+          name: Check python_requires prevents installation on Python 3.3
+          command: |
+            pyenv install 3.3.7
+            pyenv local 3.3.7
+            FAIL=false
+            pip install dist/nipype-*-py2.py3-none-any.whl || FAIL=true
+            $FAIL
       - store_artifacts:
           path: /home/circleci/nipype/dist
 

.mailmap

@@ -139,6 +139,9 @@ Michael Clark <[email protected]> Clark <[email protected]>
 Michael Dayan <[email protected]> Michael <[email protected]>
 Michael Dayan <[email protected]> Michael <[email protected]>
 Michael Dayan <[email protected]> mick-d <mid2021@CHUCK.(none)>
+Michael Dayan <[email protected]>  Michael <[email protected]>
+Michael Joseph <[email protected]> mjoseph <[email protected]>
+Michael Joseph <[email protected]> Michael Joseph <[email protected]>
 Michael Philipp Notter <[email protected]> Michael Notter <[email protected]>
 Michael Philipp Notter <[email protected]> miykael <[email protected]>
 Michael Waskom <[email protected]> Michael Waskom <[email protected]>
@@ -148,6 +151,7 @@ Michael Waskom <[email protected]> mwaskom <[email protected]>
 Michael Waskom <[email protected]> mwaskom <[email protected]>
 Michael Waskom <[email protected]> mwaskom <[email protected]>
 Miguel Molina-Romero <[email protected]> Miguel Molina <[email protected]>
+Murat Bilgel <[email protected]> Murat Bilgel <[email protected]>
 Oliver Contier <[email protected]> oliver-contier <[email protected]>
 Oscar Esteban <[email protected]> Oscar Esteban <code@oscaresteban>
 Oscar Esteban <[email protected]> oesteban <[email protected]>
@@ -157,6 +161,7 @@ Paul Sharp <[email protected]> psharp1289 <[email protected]>
 Ranjit Khanuja <[email protected]> RanjitK <[email protected]>
 Rastko Ćirić <[email protected]> rciric <[email protected]>
 Rastko Ćirić <[email protected]> Rastko Ćirić <[email protected]>
+Rastko Ćirić <[email protected]> rciric <[email protected]>
 Ross Markello <[email protected]> Ross Markello <[email protected]>
 Russell Poldrack <[email protected]> Russ Poldrack <[email protected]>
 Russell Poldrack <[email protected]> poldrack <[email protected]>
@@ -179,7 +184,11 @@ Siqi Liu <[email protected]> sql <[email protected]>
 Steven Giavasis <[email protected]> Steven Giavasis <[email protected]>
 Steven Giavasis <[email protected]> sgiavasis <[email protected]>
 Steven Giavasis <[email protected]> sgiavasis <[email protected]>
+Steven Tilley <[email protected]> Steven Tilley <[email protected]>
 Tristan Glatard <[email protected]> Tristan Glatard <[email protected]>
+Victor Férat <[email protected]> Victor <[email protected]>
+Victor Férat <[email protected]> Victor Ferat <[email protected]>
+Victor Férat <[email protected]> Victor Férat <[email protected]>
 Victor Saase <[email protected]> vsaase <[email protected]>
 Weijie Huang <[email protected]> forwho <[email protected]>
 William Triplett <[email protected]> William Triplett <[email protected]>