Merge pull request #3069 from nipy/rel/1.3.0rc1

REL: 1.3.0-rc1

Author: effigies

.circleci/config.yml

@@ -339,6 +339,7 @@ jobs:
       - run:
           name: Check pypi preconditions
           command: |
+            pyenv local 3.6.5
             pip install --upgrade pip twine future wheel readme_renderer setuptools
             python setup.py sdist bdist_wheel
             twine check dist/*
@@ -353,7 +354,7 @@ jobs:
       - run:
           name: Validate Python 3 installation
           command: |
-            pyenv local 3.5.2
+            pyenv local 3.6.5
             pip install --upgrade pip
             pip install dist/nipype-*-py2.py3-none-any.whl
             # Futures should not install in Python 3
@@ -388,6 +389,7 @@ jobs:
       - run:
           name: Deploy to PyPI
           command: |
+            pyenv local 3.6.5
             pip install --upgrade twine future wheel readme_renderer setuptools
             python setup.py check -r -s
             python setup.py sdist bdist_wheel

.mailmap

@@ -70,6 +70,7 @@ Horea Christian <horea.christ@yandex.com> <h.chr@mail.ru>
 Isaac Schwabacher <ischwabacher@wisc.edu>
 Jakub Kaczmarzyk <jakubk@mit.edu>
 James Kent <james-kent@uiowa.edu>
+James Kent <james-kent@uiowa.edu> Fred Mertz <mertzf@bargle.argle>
 Janosch Linkersdörfer <linkersdoerfer@gmail.com>
 Jason Wong <jf126dolphin@gmail.com>
 Jason Wong <jf126dolphin@gmail.com> <jasonwong73@ucla.edu>
@@ -80,6 +81,7 @@ Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <joerg.stadler@lin-magdeburg.de>
 Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <jstadler@ilin-magdeburg.de>
 Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <Stadler@lin-magdeburg.de>
 John A. Lee <johnleenimh@gmail.com>
+John A. Lee <johnleenimh@gmail.com> <leej3@users.noreply.github.com>
 Joke Durnez <joke.durnez@gmail.com>
 Josh Warner <silvertrumpet999+github@gmail.com> <warner.joshua@mayo.edu>
 Junhao WEN <anbai106@hotmail.com>
@@ -151,6 +153,7 @@ Shariq Iqbal <shariqiqbal2810@gmail.com>
 Shariq Iqbal <shariqiqbal2810@gmail.com> <shariqiqbal2810@users.noreply.github.com>
 Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <nope>
 Shoshana Berleant <berleant@stanford.edu> <shoshber@users.noreply.github.com>
+Shoshana Berleant <berleant@stanford.edu> Ubuntu <ubuntu@ip-172-31-43-202.us-west-2.compute.internal>
 Simon Rothmei <srothmei@mailbox.tu-berlin.de>
 Simon Rothmei <srothmei@mailbox.tu-berlin.de> <srothmei@users.noreply.github.com>
 Siqi Liu <lsqshr@gmail.com>