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 <michael.clark195@gmail.com> Clark <clarkmg@nih.gov>
 Michael Dayan <mdayan.research@gmail.com> Michael <mdayan.comp@gmail.com>
 Michael Dayan <mdayan.research@gmail.com> Michael <mdayan.research@gmail.com>
 Michael Dayan <mdayan.research@gmail.com> mick-d <mid2021@CHUCK.(none)>
+Michael Dayan <mdayan.research@gmail.com>  Michael <michael@mail.example.com>
+Michael Joseph <josephmje.22@gmail.com> mjoseph <josephmje.22@gmail.com>
+Michael Joseph <josephmje.22@gmail.com> Michael Joseph <josepmhje.22@gmail.com>
 Michael Philipp Notter <michaelnotter@hotmail.com> Michael Notter <michaelnotter@hotmail.com>
 Michael Philipp Notter <michaelnotter@hotmail.com> miykael <michaelnotter@hotmail.com>
 Michael Waskom <michael.l.waskom@gmail.com> Michael Waskom <mwaskom@mit.edu>
@@ -148,6 +151,7 @@ Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@mit.edu>
 Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@nyu.edu>
 Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@stanford.edu>
 Miguel Molina-Romero <miguel.molina.romero@gmail.com> Miguel Molina <miguel.molina.romero@gmail.com>
+Murat Bilgel <bilgelm@gmail.com> Murat Bilgel <murat.bilgel@nih.gov>
 Oliver Contier <o.contier@gmail.com> oliver-contier <oliver.contier@ovgu.de>
 Oscar Esteban <code@oscaresteban.es> Oscar Esteban <code@oscaresteban>
 Oscar Esteban <code@oscaresteban.es> oesteban <code@oscaresteban.es>
@@ -157,6 +161,7 @@ Paul Sharp <psharp1289@gmail.com> psharp1289 <psharp1289@gmail.com>
 Ranjit Khanuja <ranjit.jhu@gmail.com> RanjitK <ranjit.jhu@gmail.com>
 Rastko Ćirić <rc042010@mymail.pomona.edu> rciric <rc042010@mymail.pomona.edu>
 Rastko Ćirić <rc042010@mymail.pomona.edu> Rastko Ćirić <rciric@users.noreply.github.com>
+Rastko Ćirić <rc042010@mymail.pomona.edu> rciric <rastko@stanford.edu>
 Ross Markello <rossmarkello@gmail.com> Ross Markello <rdm222@cornell.edu>
 Russell Poldrack <poldrack@gmail.com> Russ Poldrack <poldrack@gmail.com>
 Russell Poldrack <poldrack@gmail.com> poldrack <poldrack@gmail.com>
@@ -179,7 +184,11 @@ Siqi Liu <lsqshr@gmail.com> sql <lsqshr@gmail.com>
 Steven Giavasis <sgiava77@gmail.com> Steven Giavasis <steven.giavasis@cmi-rsch-li001.childmind.org>
 Steven Giavasis <sgiava77@gmail.com> sgiavasis <sgiava77@gmail.com>
 Steven Giavasis <sgiava77@gmail.com> sgiavasis <sgiavasis@ieee.org>
+Steven Tilley <stilley@hollandbloorview.ca> Steven Tilley <steve@steventilley.com>
 Tristan Glatard <tristan.glatard@mcgill.ca> Tristan Glatard <tristan.glatard@creatis.insa-lyon.fr>
+Victor Férat <victor.ferat@live.fr> Victor <victor.ferat@live.fr>
+Victor Férat <victor.ferat@live.fr> Victor Ferat <vferat@fcbg.ch>
+Victor Férat <victor.ferat@live.fr> Victor Férat <victor.ferat@live.Fr>
 Victor Saase <victor@saase.net> vsaase <victor@saase.net>
 Weijie Huang <hwjbupt@gmail.com> forwho <hwjbupt@gmail.com>
 William Triplett <wtriplett@gmail.com> William Triplett <wtriplett@ufl.edu>