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

REL: 1.3.0-rc1

.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 <[email protected]> <[email protected]>
 Isaac Schwabacher <[email protected]>
 Jakub Kaczmarzyk <[email protected]>
 James Kent <[email protected]>
+James Kent <[email protected]> Fred Mertz <[email protected]>
 Janosch Linkersdörfer <[email protected]>
 Jason Wong <[email protected]>
 Jason Wong <[email protected]> <[email protected]>
@@ -80,6 +81,7 @@ Joerg Stadler <[email protected]> <[email protected]>
 Joerg Stadler <[email protected]> <[email protected]>
 Joerg Stadler <[email protected]> <[email protected]>
 John A. Lee <[email protected]>
+John A. Lee <[email protected]> <[email protected]>
 Joke Durnez <[email protected]>
 Josh Warner <[email protected]> <[email protected]>
 Junhao WEN <[email protected]>
@@ -151,6 +153,7 @@ Shariq Iqbal <[email protected]>
 Shariq Iqbal <[email protected]> <[email protected]>
 Shoshana Berleant <[email protected]> Shoshana Berleant <nope>
 Shoshana Berleant <[email protected]> <[email protected]>
+Shoshana Berleant <[email protected]> Ubuntu <[email protected]>
 Simon Rothmei <[email protected]>
 Simon Rothmei <[email protected]> <[email protected]>
 Siqi Liu <[email protected]>