Merge branch 'master' into dev/2.0

Curated by CJM

Author: effigies

.circleci/config.yml

@@ -316,14 +316,14 @@ jobs:
       - run:
           name: Check pypi preconditions
           command: |
-            pyenv local 3.5.2
+            pyenv local 3.6.5
             pip install --upgrade pip twine future wheel readme_renderer setuptools
-            python setup.py check -r -s
             python setup.py sdist bdist_wheel
+            twine check dist/*
       - 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-*-py3-none-any.whl
       - run:
@@ -336,6 +336,14 @@ jobs:
             pip install dist/nipype-*-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
 
@@ -348,7 +356,7 @@ jobs:
       - run:
           name: Deploy to PyPI
           command: |
-            pyenv local 3.5.2
+            pyenv local 3.6.5
             pip install --upgrade twine 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

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

.pre-commit-config.yaml

@@ -15,6 +15,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"
@@ -30,35 +31,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:
@@ -93,7 +71,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