MNT: Drop Python 2 support

.circleci/config.yml

@@ -56,20 +56,6 @@ _build_main_image_py36: &build_main_image_py36
  --build-arg VCS_REF="$(git rev-parse --short HEAD)" \
  --build-arg VERSION="${CIRCLE_TAG}" /home/circleci/nipype
 
-_build_main_image_py27: &build_main_image_py27
- name: Build main image (py27)
- no_output_timeout: 60m
- command: |
- tools/retry_cmd.sh -n 5 -s 15 \
- docker build \
- --rm=false \
- --tag nipype/nipype:py27 \
- --build-arg PYTHON_VERSION_MAJOR=2 \
- --build-arg PYTHON_VERSION_MINOR=7 \
- --build-arg BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
- --build-arg VCS_REF="$(git rev-parse --short HEAD)" \
- --build-arg VERSION="${CIRCLE_TAG}-py27" /home/circleci/nipype
-
 _download_test_data: &_download_test_data
  name: Download test data
  no_output_timeout: 20m
@@ -161,28 +147,22 @@ jobs:
  - run: *modify_nipype_version
  - run: *get_base_image
  - run: *build_main_image_py36
- - run: *build_main_image_py27
  - run: *_get_codecov
  - run: *_download_test_data
  - run: *prepare_working_directory
  - run:
- name: Run pytests (py36)
+ name: Run pytests
  no_output_timeout: 30m
  environment: *test_environment
- command: bash -ux /home/circleci/nipype/.circleci/test_py3_pytest.sh
- - run:
- name: Run pytests (py27)
- no_output_timeout: 30m
- environment: *test_environment
- command: bash -ux /home/circleci/nipype/.circleci/test_py2_pytest.sh
+ command: bash -ux /home/circleci/nipype/.circleci/test_pytest.sh
  - run: *_run_codecov_coverage
  - store_artifacts: *store_artifacts_kwds
  - store_test_results: *store_artifacts_kwds
  - run:
- name: Build docs (py36)
+ name: Build docs
  no_output_timeout: 30m
  environment: *test_environment
- command: bash -ux /home/circleci/nipype/.circleci/test_py3_docs.sh
+ command: bash -ux /home/circleci/nipype/.circleci/build_docs.sh
  - store_artifacts:
  path: /home/circleci/work/docs
  - run:
@@ -192,16 +172,15 @@ jobs:
  if [ "$CIRCLE_BRANCH" = "master" -a -z "$CIRCLE_PULL_REQUEST" ]; then
  docker save nipype/nipype:base \
  nipype/nipype:latest \
- nipype/nipype:py27 \
- nipype/nipype:py36 | gzip -1 > /tmp/docker/nipype-base-latest-py36-py27.tar.gz \
- && du -h /tmp/docker/nipype-base-latest-py36-py27.tar.gz
+ nipype/nipype:py36 | gzip -1 > /tmp/docker/nipype-base-latest-py36.tar.gz \
+ && du -h /tmp/docker/nipype-base-latest-py36.tar.gz
  fi
  - persist_to_workspace:
  root: /tmp
  paths:
  - docker
 
- test_py3_fmri_fsl_spm:
+ test_fmri_fsl_spm:
  machine: *machine_kwds
  working_directory: /home/circleci/nipype
  steps:
@@ -218,24 +197,24 @@ jobs:
  - run: *_download_test_data
  - run: *prepare_working_directory
  - run:
- name: Run FSL reuse pipeline (py36)
+ name: Run FSL reuse pipeline
  no_output_timeout: 40m
  environment: *test_environment
- command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_fsl_reuse_linear_l1.sh
+ command: bash -ux /home/circleci/nipype/.circleci/test_fmri_fsl_reuse_linear_l1.sh
  - run:
- name: Run SPM test workflow - 3D inputs (py36)
+ name: Run SPM test workflow - 3D inputs
  no_output_timeout: 40m
  environment: *test_environment
- command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_spm_linear_3d.sh
+ command: bash -ux /home/circleci/nipype/.circleci/test_fmri_spm_linear_3d.sh
  - run:
- name: Run SPM test workflow - 4D inputs (py36)
+ name: Run SPM test workflow - 4D inputs
  no_output_timeout: 40m
  environment: *test_environment
- command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_spm_linear_4d.sh
+ command: bash -ux /home/circleci/nipype/.circleci/test_fmri_spm_linear_4d.sh
  - run: *_run_codecov_smoke
  - store_artifacts: *store_artifacts_kwds
 
- test_py3_fmri_spm_dartel_multiproc:
+ test_fmri_spm_dartel_multiproc:
  machine: *machine_kwds
  working_directory: /home/circleci/nipype
  steps:
@@ -252,15 +231,15 @@ jobs:
  - run: *_download_test_data
  - run: *prepare_working_directory
  - run:
- name: Run SPM DARTEL Level 1 pipeline (py36)
+ name: Run SPM DARTEL Level 1 pipeline
  no_output_timeout: 1h
  environment: *test_environment
- command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_spm_dartel_multiproc_l1.sh
+ command: bash -ux /home/circleci/nipype/.circleci/test_fmri_spm_dartel_multiproc_l1.sh
  - run:
- name: Run SPM DARTEL Level 2 pipeline (py36)
+ name: Run SPM DARTEL Level 2 pipeline
  no_output_timeout: 30m
  environment: *test_environment
- command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_spm_dartel_multiproc_l2.sh
+ command: bash -ux /home/circleci/nipype/.circleci/test_fmri_spm_dartel_multiproc_l2.sh
  - run: *_run_codecov_smoke
  - store_artifacts: *store_artifacts_kwds
 
@@ -277,25 +256,24 @@ jobs:
  - run: *modify_nipype_version
  - run: *get_base_image
  - run: *build_main_image_py36
- - run: *build_main_image_py27
  - run: *_get_codecov
  - run: *_download_test_data
  - run: *prepare_working_directory
  - run:
- name: Run SPM Nested Level 1 pipeline (py36)
+ name: Run SPM Nested Level 1 pipeline
  no_output_timeout: 1h
  environment: *test_environment
- command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_spm_nested_multiproc_l1.sh
+ command: bash -ux /home/circleci/nipype/.circleci/test_fmri_spm_nested_multiproc_l1.sh
  - run:
- name: Run SPM Nested Level 2 pipeline (py27)
+ name: Run SPM Nested Level 2 pipeline
  no_output_timeout: 30m
  environment: *test_environment
- command: bash -ux /home/circleci/nipype/.circleci/test_py2_fmri_spm_nested_multiproc_l2.sh
+ command: bash -ux /home/circleci/nipype/.circleci/test_fmri_spm_nested_multiproc_l2.sh
  - run:
- name: Run FSL FEEDS pipeline (py36)
+ name: Run FSL FEEDS pipeline
  no_output_timeout: 40m
  environment: *test_environment
- command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_fsl_feeds_linear_l1.sh
+ command: bash -ux /home/circleci/nipype/.circleci/test_fmri_fsl_feeds_linear_l1.sh
  - run: *_run_codecov_smoke
  - store_artifacts: *store_artifacts_kwds
 
@@ -310,7 +288,7 @@ jobs:
  name: Load saved Docker images.
  no_output_timeout: 60m
  command: |
- docker load < /tmp/docker/nipype-base-latest-py36-py27.tar.gz
+ docker load < /tmp/docker/nipype-base-latest-py36.tar.gz
  - run:
  name: Push to DockerHub
  no_output_timeout: 120m
@@ -319,7 +297,6 @@ jobs:
  docker push nipype/nipype:base
  docker push nipype/nipype:latest
  docker push nipype/nipype:py36
- docker push nipype/nipype:py27
  - run:
  name: Move pruned Dockerfile to /tmp/docker/cache directory
  command: |
@@ -339,21 +316,15 @@ jobs:
  - run:
  name: Check pypi preconditions
  command: |
+ pyenv local 3.5.2
  pip install --upgrade twine future wheel readme_renderer setuptools
  python setup.py check -r -s
  python setup.py sdist bdist_wheel
- - run:
- name: Validate Python 2 installation
- command: |
- pyenv local 2.7.12
- 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 dist/nipype-*-py2.py3-none-any.whl
+ pip install dist/nipype-*-py3-none-any.whl
  # Futures should not install in Python 3
  test $(pip show futures 2>/dev/null | wc -l) = "0"
  - store_artifacts:
@@ -368,6 +339,7 @@ jobs:
  - run:
  name: Deploy to PyPI
  command: |
+ pyenv local 3.5.2
  pip install --upgrade twine future wheel readme_renderer setuptools
  python setup.py check -r -s
  python setup.py sdist bdist_wheel
@@ -412,7 +384,7 @@ workflows:
  - pypi_precheck:
  filters:
  branches:
- only: /rel\/.*/
+ only: /(rel|dev)\/.*/
  tags:
  only: /.*/
  - compare_base_dockerfiles:
@@ -425,10 +397,10 @@ workflows:
  only: /.*/
  requires:
  - compare_base_dockerfiles
- - test_py3_fmri_fsl_spm:
+ - test_fmri_fsl_spm:
  requires:
  - compare_base_dockerfiles
- - test_py3_fmri_spm_dartel_multiproc:
+ - test_fmri_spm_dartel_multiproc:
  requires:
  - compare_base_dockerfiles
  - test_fmri_spm_nested_fsl_feeds:
@@ -441,8 +413,8 @@ workflows:
  requires:
  - test_pytest
  - test_fmri_spm_nested_fsl_feeds
- - test_py3_fmri_fsl_spm
- - test_py3_fmri_spm_dartel_multiproc
+ - test_fmri_fsl_spm
+ - test_fmri_spm_dartel_multiproc
  - deploy_pypi:
  filters:
  branches:

.circleci/test_py2_fmri_spm_nested_multiproc_l2.sh → .circleci/test_fmri_spm_nested_multiproc_l2.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work -e NIPYPE_NUMBER_OF_CPUS=4 -e NIPYPE_RESOURCE_MONITOR=1 "${DOCKER_IMAGE}:py27" /usr/bin/run_examples.sh fmri_spm_nested MultiProc /data/examples/ l2pipeline
+docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work -e NIPYPE_NUMBER_OF_CPUS=4 -e NIPYPE_RESOURCE_MONITOR=1 "${DOCKER_IMAGE}:py36" /usr/bin/run_examples.sh fmri_spm_nested MultiProc /data/examples/ l2pipeline

.travis.yml

@@ -4,10 +4,10 @@ sudo: required
 language: python
 # our build matrix
 python:
-- 2.7
 - 3.4
 - 3.5
 - 3.6
+- 3.7-dev
 
 env:
  global:

CONTRIBUTING.md

@@ -116,7 +116,7 @@ One your PR is ready a member of the development team will review your changes t
 In general, do not catch exceptions without good reason.
 For non-fatal exceptions, log the exception as a warning and add more information about what may have caused the error.
 
-If you do need to catch an exception, raise a new exception using ``raise_from(NewException("message"), oldException)`` from ``future``.
+If you do need to catch an exception, raise a new exception using ``raise NewException("message") from oldException)``.
 Do not log this, as it creates redundant/confusing logs.
 
 #### Testing

nipype/__init__.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
-from __future__ import (print_function, division, unicode_literals,
- absolute_import)
-
 import os
 from distutils.version import LooseVersion
 

nipype/algorithms/confounds.py

@@ -4,10 +4,6 @@
 '''
 Algorithms to compute confounds in :abbr:`fMRI (functional MRI)`
 '''
-from __future__ import (print_function, division, unicode_literals,
- absolute_import)
-from builtins import range
-
 import os
 import os.path as op
 

nipype/algorithms/icc.py

@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import (print_function, division, unicode_literals,
- absolute_import)
-from builtins import range
 import os
 import numpy as np
 from numpy import ones, kron, mean, eye, hstack, dot, tile

nipype/algorithms/mesh.py

@@ -4,10 +4,6 @@
 """
 Miscellaneous algorithms for 2D contours and 3D triangularized meshes handling
 """
-from __future__ import (print_function, division, unicode_literals,
- absolute_import)
-from builtins import zip, str, bytes
-
 import os.path as op
 import numpy as np
 from numpy import linalg as nla

nipype/algorithms/metrics.py

@@ -5,10 +5,6 @@
 Image assessment algorithms. Typical overlap and error computation
 measures to evaluate results from other processing units.
 '''
-from __future__ import (print_function, division, unicode_literals,
- absolute_import)
-from builtins import zip, range
-
 import os
 import os.path as op
 

nipype/algorithms/misc.py

@@ -4,11 +4,6 @@
 '''
 Miscellaneous algorithms
 '''
-from __future__ import (print_function, division, unicode_literals,
- absolute_import)
-from builtins import str, zip, range, open
-from future.utils import raise_from
-
 import os
 import os.path as op
 
@@ -794,9 +789,8 @@ def _run_interface(self, runtime):
  try:
  import pandas as pd
  except ImportError as e:
- raise_from(
- ImportError('This interface requires pandas '
- '(http://pandas.pydata.org/) to run.'), e)
+ raise ImportError('This interface requires pandas '
+ '(http://pandas.pydata.org/) to run.') from e
 
  try:
  import lockfile as pl

nipype/algorithms/modelgen.py

@@ -11,10 +11,6 @@
 
  * SpecifyModel: allows specification of sparse and non-sparse models
 """
-from __future__ import (print_function, division, unicode_literals,
- absolute_import)
-from builtins import range, str, bytes, int
-
 from copy import deepcopy
 import os
 

nipype/algorithms/rapidart.py

@@ -12,10 +12,6 @@
  * StimulusCorrelation: determines correlation between stimuli
  schedule and movement/intensity parameters
 """
-from __future__ import (print_function, division, unicode_literals,
- absolute_import)
-from builtins import open, range, str, bytes
-
 import os
 from copy import deepcopy
 

nipype/algorithms/stats.py

@@ -4,8 +4,6 @@
 """
 Managing statistical maps
 """
-from __future__ import (print_function, division, unicode_literals,
- absolute_import)
 import os
 import nibabel as nb
 import numpy as np

nipype/algorithms/tests/test_auto_ACompCor.py

@@ -1,5 +1,4 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
-from __future__ import unicode_literals
 from ..confounds import ACompCor
 
 

nipype/algorithms/tests/test_auto_ActivationCount.py

@@ -1,5 +1,4 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
-from __future__ import unicode_literals
 from ..stats import ActivationCount
 
 

nipype/algorithms/tests/test_auto_AddCSVColumn.py

@@ -1,5 +1,4 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
-from __future__ import unicode_literals
 from ..misc import AddCSVColumn
 
 

nipype/algorithms/tests/test_auto_AddCSVRow.py

@@ -1,5 +1,4 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
-from __future__ import unicode_literals
 from ..misc import AddCSVRow