Merge remote-tracking branch 'origin/master' into FIX/readconf

Author: stilley2

.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

.et

@@ -0,0 +1,3 @@
+{ "bad_versions" : [ "1.2.1",
+                     "1.2.3"]
+}

.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>

.pre-commit-config.yaml

@@ -0,0 +1,14 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.0.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
+-   repo: https://github.com/psf/black
+    rev: 19.3b0
+    hooks:
+    -   id: black

.travis.yml

@@ -16,6 +16,7 @@ env:
     - EXTRA_WHEELS="https://5cf40426d9f06eb7461d-6fe47d9331aba7cd62fc36c7196769e4.ssl.cf2.rackcdn.com"
     - PRE_WHEELS="https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"
     - EXTRA_PIP_FLAGS="--find-links=$EXTRA_WHEELS"
+    - CHECK_TYPE=test
   matrix:
     - INSTALL_DEB_DEPENDECIES=true
       NIPYPE_EXTRAS="doc,tests,nipy,profiler"
@@ -31,35 +32,12 @@ env:
       EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS"
       CI_SKIP_TEST=1
 
-# Python 3.4 is only available on Trusty, so we need to duplicate the
-# env matrix specifically for it.
 matrix:
   include:
-    - python: 3.4
-      dist: trusty
+    - python: 3.7
       env:
-        - INSTALL_DEB_DEPENDECIES=true
-          NIPYPE_EXTRAS="doc,tests,nipy,profiler"
-          CI_SKIP_TEST=1
-    - python: 3.4
-      dist: trusty
-      env:
-        - INSTALL_DEB_DEPENDECIES=false
-          NIPYPE_EXTRAS="doc,tests,profiler"
-          CI_SKIP_TEST=1
-    - python: 3.4
-      dist: trusty
-      env:
-        - INSTALL_DEB_DEPENDECIES=true
-          NIPYPE_EXTRAS="doc,tests,nipy,profiler,duecredit,ssh"
-          CI_SKIP_TEST=1
-    - python: 3.4
-      dist: trusty
-      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
+        - NIPYPE_EXTRAS=dev
+          CHECK_TYPE=specs
 
 addons:
   apt:
@@ -94,7 +72,16 @@ install:
 - 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 -n auto
+- |
+    if [ "$CHECK_TYPE" = "test" ]; then
+        py.test -v --cov nipype --cov-config .coveragerc --cov-report xml:cov.xml -c nipype/pytest.ini --doctest-modules nipype -n auto
+    fi
+- |
+    if [ "$CHECK_TYPE" = "specs" ]; then
+        make specs
+        git add nipype
+        test "$( git diff --cached | wc -l )" -eq 0 || ( git diff --cached && false )
+    fi
 
 after_script:
 - codecov --file cov.xml --flags unittests -e TRAVIS_JOB_NUMBER