diff --git a/.circleci/test_py3_docs.sh b/.circleci/build_docs.sh similarity index 100% rename from .circleci/test_py3_docs.sh rename to .circleci/build_docs.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 3fc27bf663..3eed619d56 100644 --- a/.circleci/config.yml +++ b/.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: | @@ -343,22 +320,12 @@ jobs: pip install --upgrade pip twine future wheel readme_renderer setuptools python setup.py sdist bdist_wheel twine check dist/* - - run: - name: Validate Python 2 installation - command: | - pyenv local 2.7.12 - pip install --upgrade pip - 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.6.5 pip install --upgrade pip - pip install dist/nipype-*-py2.py3-none-any.whl - # Futures should not install in Python 3 - test $(pip show futures 2>/dev/null | wc -l) = "0" + pip install dist/nipype-*-py3-none-any.whl - run: name: Validate Python 3.7 installation command: | @@ -366,7 +333,7 @@ jobs: pip install --upgrade pip # Pre-install a version of numpy that will not pass pip install numpy==1.15.0 - pip install dist/nipype-*-py2.py3-none-any.whl + 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: @@ -390,7 +357,7 @@ jobs: name: Deploy to PyPI command: | pyenv local 3.6.5 - pip install --upgrade twine future wheel readme_renderer setuptools + pip install --upgrade twine wheel readme_renderer setuptools python setup.py check -r -s python setup.py sdist bdist_wheel twine upload dist/* @@ -434,7 +401,7 @@ workflows: - pypi_precheck: filters: branches: - only: /rel\/.*/ + only: /(rel|dev)\/.*/ tags: only: /.*/ - compare_base_dockerfiles: @@ -447,10 +414,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: @@ -463,8 +430,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: diff --git a/.circleci/test_py3_fmri_fsl_feeds_linear_l1.sh b/.circleci/test_fmri_fsl_feeds_linear_l1.sh similarity index 100% rename from .circleci/test_py3_fmri_fsl_feeds_linear_l1.sh rename to .circleci/test_fmri_fsl_feeds_linear_l1.sh diff --git a/.circleci/test_py3_fmri_fsl_reuse_linear_l1.sh b/.circleci/test_fmri_fsl_reuse_linear_l1.sh similarity index 100% rename from .circleci/test_py3_fmri_fsl_reuse_linear_l1.sh rename to .circleci/test_fmri_fsl_reuse_linear_l1.sh diff --git a/.circleci/test_py3_fmri_spm_dartel_multiproc_l1.sh b/.circleci/test_fmri_spm_dartel_multiproc_l1.sh similarity index 100% rename from .circleci/test_py3_fmri_spm_dartel_multiproc_l1.sh rename to .circleci/test_fmri_spm_dartel_multiproc_l1.sh diff --git a/.circleci/test_py3_fmri_spm_dartel_multiproc_l2.sh b/.circleci/test_fmri_spm_dartel_multiproc_l2.sh similarity index 100% rename from .circleci/test_py3_fmri_spm_dartel_multiproc_l2.sh rename to .circleci/test_fmri_spm_dartel_multiproc_l2.sh diff --git a/.circleci/test_py3_fmri_spm_linear_3d.sh b/.circleci/test_fmri_spm_linear_3d.sh similarity index 100% rename from .circleci/test_py3_fmri_spm_linear_3d.sh rename to .circleci/test_fmri_spm_linear_3d.sh diff --git a/.circleci/test_py3_fmri_spm_linear_4d.sh b/.circleci/test_fmri_spm_linear_4d.sh similarity index 100% rename from .circleci/test_py3_fmri_spm_linear_4d.sh rename to .circleci/test_fmri_spm_linear_4d.sh diff --git a/.circleci/test_py3_fmri_spm_nested_multiproc_l1.sh b/.circleci/test_fmri_spm_nested_multiproc_l1.sh similarity index 100% rename from .circleci/test_py3_fmri_spm_nested_multiproc_l1.sh rename to .circleci/test_fmri_spm_nested_multiproc_l1.sh diff --git a/.circleci/test_py2_fmri_spm_nested_multiproc_l2.sh b/.circleci/test_fmri_spm_nested_multiproc_l2.sh similarity index 75% rename from .circleci/test_py2_fmri_spm_nested_multiproc_l2.sh rename to .circleci/test_fmri_spm_nested_multiproc_l2.sh index 1aa2a4f8c5..c0926be148 100644 --- a/.circleci/test_py2_fmri_spm_nested_multiproc_l2.sh +++ b/.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 diff --git a/.circleci/test_py2_pytest.sh b/.circleci/test_py2_pytest.sh deleted file mode 100644 index df1489d240..0000000000 --- a/.circleci/test_py2_pytest.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work -e CI_SKIP_TEST=1 -e NIPYPE_RESOURCE_MONITOR=1 "${DOCKER_IMAGE}:py27" /usr/bin/run_pytests.sh diff --git a/.circleci/test_py3_pytest.sh b/.circleci/test_pytest.sh similarity index 100% rename from .circleci/test_py3_pytest.sh rename to .circleci/test_pytest.sh diff --git a/.travis.yml b/.travis.yml index f79018dd50..4bcb4f428f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ sudo: true language: python # our build matrix python: -- 2.7 - 3.5 - 3.6 - 3.7 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 331cdd88fe..118d49004c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -122,7 +122,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 diff --git a/nipype/__init__.py b/nipype/__init__.py index 821a411009..0773845b89 100644 --- a/nipype/__init__.py +++ b/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 diff --git a/nipype/algorithms/confounds.py b/nipype/algorithms/confounds.py index a987c98e55..4e09a1700a 100644 --- a/nipype/algorithms/confounds.py +++ b/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 from collections import OrderedDict diff --git a/nipype/algorithms/icc.py b/nipype/algorithms/icc.py index a508eb5037..ff57cc1fd4 100644 --- a/nipype/algorithms/icc.py +++ b/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 diff --git a/nipype/algorithms/mesh.py b/nipype/algorithms/mesh.py index 88ef8fc15f..2d5c7d2d49 100644 --- a/nipype/algorithms/mesh.py +++ b/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 diff --git a/nipype/algorithms/metrics.py b/nipype/algorithms/metrics.py index 0c35352f34..d1075ec04e 100644 --- a/nipype/algorithms/metrics.py +++ b/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 diff --git a/nipype/algorithms/misc.py b/nipype/algorithms/misc.py index 4fcd7c8d85..fc44e8738f 100644 --- a/nipype/algorithms/misc.py +++ b/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: from filelock import SoftFileLock diff --git a/nipype/algorithms/modelgen.py b/nipype/algorithms/modelgen.py index 56db46b9f5..9beb0f031d 100644 --- a/nipype/algorithms/modelgen.py +++ b/nipype/algorithms/modelgen.py @@ -11,12 +11,6 @@ * SpecifyModel: allows specification of sparse and non-sparse models """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) - -str_basetype = str -from builtins import range, str, bytes, int - from copy import deepcopy import csv, math, os @@ -175,7 +169,7 @@ def bids_gen_info(bids_event_files, info = [] for bids_event_file in bids_event_files: with open(bids_event_file) as f: - f_events = csv.DictReader(f, skipinitialspace=True, delimiter=str_basetype('\t')) + f_events = csv.DictReader(f, skipinitialspace=True, delimiter='\t') events = [{k: v for k, v in row.items()} for row in f_events] if not condition_column: condition_column = '_trial_type' diff --git a/nipype/algorithms/rapidart.py b/nipype/algorithms/rapidart.py index d412493714..6371458ca3 100644 --- a/nipype/algorithms/rapidart.py +++ b/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 diff --git a/nipype/algorithms/stats.py b/nipype/algorithms/stats.py index 51a3bc9088..29a45f5844 100644 --- a/nipype/algorithms/stats.py +++ b/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 diff --git a/nipype/algorithms/tests/test_auto_ACompCor.py b/nipype/algorithms/tests/test_auto_ACompCor.py index d216a26a4b..598bbd7c5a 100644 --- a/nipype/algorithms/tests/test_auto_ACompCor.py +++ b/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 diff --git a/nipype/algorithms/tests/test_auto_ActivationCount.py b/nipype/algorithms/tests/test_auto_ActivationCount.py index 0925ca1a95..f3b8d77f23 100644 --- a/nipype/algorithms/tests/test_auto_ActivationCount.py +++ b/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 diff --git a/nipype/algorithms/tests/test_auto_AddCSVColumn.py b/nipype/algorithms/tests/test_auto_AddCSVColumn.py index 4acd27380e..b761ad25f5 100644 --- a/nipype/algorithms/tests/test_auto_AddCSVColumn.py +++ b/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 diff --git a/nipype/algorithms/tests/test_auto_AddCSVRow.py b/nipype/algorithms/tests/test_auto_AddCSVRow.py index a8c4467cbf..13d3da48b9 100644 --- a/nipype/algorithms/tests/test_auto_AddCSVRow.py +++ b/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 diff --git a/nipype/algorithms/tests/test_auto_AddNoise.py b/nipype/algorithms/tests/test_auto_AddNoise.py index bc9772d501..e98a761ca7 100644 --- a/nipype/algorithms/tests/test_auto_AddNoise.py +++ b/nipype/algorithms/tests/test_auto_AddNoise.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..misc import AddNoise diff --git a/nipype/algorithms/tests/test_auto_ArtifactDetect.py b/nipype/algorithms/tests/test_auto_ArtifactDetect.py index cc09f4feff..6d49a4bd27 100644 --- a/nipype/algorithms/tests/test_auto_ArtifactDetect.py +++ b/nipype/algorithms/tests/test_auto_ArtifactDetect.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..rapidart import ArtifactDetect diff --git a/nipype/algorithms/tests/test_auto_CalculateMedian.py b/nipype/algorithms/tests/test_auto_CalculateMedian.py index 1f9aa6cd4d..1da36b096f 100644 --- a/nipype/algorithms/tests/test_auto_CalculateMedian.py +++ b/nipype/algorithms/tests/test_auto_CalculateMedian.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..misc import CalculateMedian diff --git a/nipype/algorithms/tests/test_auto_CalculateNormalizedMoments.py b/nipype/algorithms/tests/test_auto_CalculateNormalizedMoments.py index b175f45fa6..06ad3c3508 100644 --- a/nipype/algorithms/tests/test_auto_CalculateNormalizedMoments.py +++ b/nipype/algorithms/tests/test_auto_CalculateNormalizedMoments.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..misc import CalculateNormalizedMoments diff --git a/nipype/algorithms/tests/test_auto_ComputeDVARS.py b/nipype/algorithms/tests/test_auto_ComputeDVARS.py index b6a9b4dfb5..3c68d0bd98 100644 --- a/nipype/algorithms/tests/test_auto_ComputeDVARS.py +++ b/nipype/algorithms/tests/test_auto_ComputeDVARS.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..confounds import ComputeDVARS diff --git a/nipype/algorithms/tests/test_auto_ComputeMeshWarp.py b/nipype/algorithms/tests/test_auto_ComputeMeshWarp.py index adaebaaa00..cf76cd7467 100644 --- a/nipype/algorithms/tests/test_auto_ComputeMeshWarp.py +++ b/nipype/algorithms/tests/test_auto_ComputeMeshWarp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..mesh import ComputeMeshWarp diff --git a/nipype/algorithms/tests/test_auto_CreateNifti.py b/nipype/algorithms/tests/test_auto_CreateNifti.py index a40f446d74..af9853227c 100644 --- a/nipype/algorithms/tests/test_auto_CreateNifti.py +++ b/nipype/algorithms/tests/test_auto_CreateNifti.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..misc import CreateNifti diff --git a/nipype/algorithms/tests/test_auto_Distance.py b/nipype/algorithms/tests/test_auto_Distance.py index 5b3a165f56..254a6b23d2 100644 --- a/nipype/algorithms/tests/test_auto_Distance.py +++ b/nipype/algorithms/tests/test_auto_Distance.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..misc import Distance diff --git a/nipype/algorithms/tests/test_auto_FramewiseDisplacement.py b/nipype/algorithms/tests/test_auto_FramewiseDisplacement.py index 47334ab77c..e529b891e7 100644 --- a/nipype/algorithms/tests/test_auto_FramewiseDisplacement.py +++ b/nipype/algorithms/tests/test_auto_FramewiseDisplacement.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..confounds import FramewiseDisplacement diff --git a/nipype/algorithms/tests/test_auto_FuzzyOverlap.py b/nipype/algorithms/tests/test_auto_FuzzyOverlap.py index c92c033643..80513bd850 100644 --- a/nipype/algorithms/tests/test_auto_FuzzyOverlap.py +++ b/nipype/algorithms/tests/test_auto_FuzzyOverlap.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..misc import FuzzyOverlap diff --git a/nipype/algorithms/tests/test_auto_Gunzip.py b/nipype/algorithms/tests/test_auto_Gunzip.py index d84e84ad61..765a1a3f68 100644 --- a/nipype/algorithms/tests/test_auto_Gunzip.py +++ b/nipype/algorithms/tests/test_auto_Gunzip.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..misc import Gunzip diff --git a/nipype/algorithms/tests/test_auto_ICC.py b/nipype/algorithms/tests/test_auto_ICC.py index 78e600bdd4..2056ad000e 100644 --- a/nipype/algorithms/tests/test_auto_ICC.py +++ b/nipype/algorithms/tests/test_auto_ICC.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..icc import ICC diff --git a/nipype/algorithms/tests/test_auto_Matlab2CSV.py b/nipype/algorithms/tests/test_auto_Matlab2CSV.py index 6bc2a9caba..b783f317f7 100644 --- a/nipype/algorithms/tests/test_auto_Matlab2CSV.py +++ b/nipype/algorithms/tests/test_auto_Matlab2CSV.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..misc import Matlab2CSV diff --git a/nipype/algorithms/tests/test_auto_MergeCSVFiles.py b/nipype/algorithms/tests/test_auto_MergeCSVFiles.py index f109fea025..aeacb0eaf5 100644 --- a/nipype/algorithms/tests/test_auto_MergeCSVFiles.py +++ b/nipype/algorithms/tests/test_auto_MergeCSVFiles.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..misc import MergeCSVFiles diff --git a/nipype/algorithms/tests/test_auto_MergeROIs.py b/nipype/algorithms/tests/test_auto_MergeROIs.py index 528f847b22..a588955342 100644 --- a/nipype/algorithms/tests/test_auto_MergeROIs.py +++ b/nipype/algorithms/tests/test_auto_MergeROIs.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..misc import MergeROIs diff --git a/nipype/algorithms/tests/test_auto_MeshWarpMaths.py b/nipype/algorithms/tests/test_auto_MeshWarpMaths.py index 664e6e2bc3..887f5a54e7 100644 --- a/nipype/algorithms/tests/test_auto_MeshWarpMaths.py +++ b/nipype/algorithms/tests/test_auto_MeshWarpMaths.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..mesh import MeshWarpMaths diff --git a/nipype/algorithms/tests/test_auto_ModifyAffine.py b/nipype/algorithms/tests/test_auto_ModifyAffine.py index a0c4150a98..d524a3cf58 100644 --- a/nipype/algorithms/tests/test_auto_ModifyAffine.py +++ b/nipype/algorithms/tests/test_auto_ModifyAffine.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..misc import ModifyAffine diff --git a/nipype/algorithms/tests/test_auto_NonSteadyStateDetector.py b/nipype/algorithms/tests/test_auto_NonSteadyStateDetector.py index 10eb41190b..453f7c17f0 100644 --- a/nipype/algorithms/tests/test_auto_NonSteadyStateDetector.py +++ b/nipype/algorithms/tests/test_auto_NonSteadyStateDetector.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..confounds import NonSteadyStateDetector diff --git a/nipype/algorithms/tests/test_auto_NormalizeProbabilityMapSet.py b/nipype/algorithms/tests/test_auto_NormalizeProbabilityMapSet.py index 59ffc9d9cb..da95a8b2a2 100644 --- a/nipype/algorithms/tests/test_auto_NormalizeProbabilityMapSet.py +++ b/nipype/algorithms/tests/test_auto_NormalizeProbabilityMapSet.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..misc import NormalizeProbabilityMapSet diff --git a/nipype/algorithms/tests/test_auto_P2PDistance.py b/nipype/algorithms/tests/test_auto_P2PDistance.py index 65461ede3c..a10b6e4b58 100644 --- a/nipype/algorithms/tests/test_auto_P2PDistance.py +++ b/nipype/algorithms/tests/test_auto_P2PDistance.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..mesh import P2PDistance diff --git a/nipype/algorithms/tests/test_auto_PickAtlas.py b/nipype/algorithms/tests/test_auto_PickAtlas.py index 9787af79dd..7fbe81307e 100644 --- a/nipype/algorithms/tests/test_auto_PickAtlas.py +++ b/nipype/algorithms/tests/test_auto_PickAtlas.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..misc import PickAtlas diff --git a/nipype/algorithms/tests/test_auto_Similarity.py b/nipype/algorithms/tests/test_auto_Similarity.py index b74728774c..f138e36295 100644 --- a/nipype/algorithms/tests/test_auto_Similarity.py +++ b/nipype/algorithms/tests/test_auto_Similarity.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..metrics import Similarity diff --git a/nipype/algorithms/tests/test_auto_SimpleThreshold.py b/nipype/algorithms/tests/test_auto_SimpleThreshold.py index 4e34d86799..2c66dc9f76 100644 --- a/nipype/algorithms/tests/test_auto_SimpleThreshold.py +++ b/nipype/algorithms/tests/test_auto_SimpleThreshold.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..misc import SimpleThreshold diff --git a/nipype/algorithms/tests/test_auto_SpecifyModel.py b/nipype/algorithms/tests/test_auto_SpecifyModel.py index 1f883e3677..4c856de1bb 100644 --- a/nipype/algorithms/tests/test_auto_SpecifyModel.py +++ b/nipype/algorithms/tests/test_auto_SpecifyModel.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..modelgen import SpecifyModel diff --git a/nipype/algorithms/tests/test_auto_SpecifySPMModel.py b/nipype/algorithms/tests/test_auto_SpecifySPMModel.py index 53fe0b3850..a0f2c5a1a6 100644 --- a/nipype/algorithms/tests/test_auto_SpecifySPMModel.py +++ b/nipype/algorithms/tests/test_auto_SpecifySPMModel.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..modelgen import SpecifySPMModel diff --git a/nipype/algorithms/tests/test_auto_SpecifySparseModel.py b/nipype/algorithms/tests/test_auto_SpecifySparseModel.py index 3e91aa242f..839cba7e60 100644 --- a/nipype/algorithms/tests/test_auto_SpecifySparseModel.py +++ b/nipype/algorithms/tests/test_auto_SpecifySparseModel.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..modelgen import SpecifySparseModel diff --git a/nipype/algorithms/tests/test_auto_SplitROIs.py b/nipype/algorithms/tests/test_auto_SplitROIs.py index 23633e98f4..acaef12eee 100644 --- a/nipype/algorithms/tests/test_auto_SplitROIs.py +++ b/nipype/algorithms/tests/test_auto_SplitROIs.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..misc import SplitROIs diff --git a/nipype/algorithms/tests/test_auto_StimulusCorrelation.py b/nipype/algorithms/tests/test_auto_StimulusCorrelation.py index 9ed943ce2a..c39fa0bc97 100644 --- a/nipype/algorithms/tests/test_auto_StimulusCorrelation.py +++ b/nipype/algorithms/tests/test_auto_StimulusCorrelation.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..rapidart import StimulusCorrelation diff --git a/nipype/algorithms/tests/test_auto_TCompCor.py b/nipype/algorithms/tests/test_auto_TCompCor.py index ba448fd965..9fe97f946b 100644 --- a/nipype/algorithms/tests/test_auto_TCompCor.py +++ b/nipype/algorithms/tests/test_auto_TCompCor.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..confounds import TCompCor diff --git a/nipype/algorithms/tests/test_auto_TVTKBaseInterface.py b/nipype/algorithms/tests/test_auto_TVTKBaseInterface.py index 9fc2d17aba..d9b7309778 100644 --- a/nipype/algorithms/tests/test_auto_TVTKBaseInterface.py +++ b/nipype/algorithms/tests/test_auto_TVTKBaseInterface.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..mesh import TVTKBaseInterface diff --git a/nipype/algorithms/tests/test_auto_WarpPoints.py b/nipype/algorithms/tests/test_auto_WarpPoints.py index 67b101724d..3c18186db7 100644 --- a/nipype/algorithms/tests/test_auto_WarpPoints.py +++ b/nipype/algorithms/tests/test_auto_WarpPoints.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..mesh import WarpPoints diff --git a/nipype/algorithms/tests/test_confounds.py b/nipype/algorithms/tests/test_confounds.py index 2c601374ab..c9ef93f49f 100644 --- a/nipype/algorithms/tests/test_confounds.py +++ b/nipype/algorithms/tests/test_confounds.py @@ -2,8 +2,6 @@ # -*- coding: utf-8 -*- import os -from io import open - import pytest from nipype.testing import example_data from nipype.algorithms.confounds import FramewiseDisplacement, ComputeDVARS, \ diff --git a/nipype/algorithms/tests/test_icc_anova.py b/nipype/algorithms/tests/test_icc_anova.py index ef19b7f410..79ed312f40 100644 --- a/nipype/algorithms/tests/test_icc_anova.py +++ b/nipype/algorithms/tests/test_icc_anova.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import division import numpy as np from nipype.algorithms.icc import ICC_rep_anova diff --git a/nipype/algorithms/tests/test_modelgen.py b/nipype/algorithms/tests/test_modelgen.py index 01d9b1d0c6..759e53b0a4 100644 --- a/nipype/algorithms/tests/test_modelgen.py +++ b/nipype/algorithms/tests/test_modelgen.py @@ -1,7 +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 division from copy import deepcopy import os diff --git a/nipype/algorithms/tests/test_normalize_tpms.py b/nipype/algorithms/tests/test_normalize_tpms.py index a65cc66770..31eb2b96dd 100644 --- a/nipype/algorithms/tests/test_normalize_tpms.py +++ b/nipype/algorithms/tests/test_normalize_tpms.py @@ -3,7 +3,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: -from builtins import range import os import pytest diff --git a/nipype/algorithms/tests/test_rapidart.py b/nipype/algorithms/tests/test_rapidart.py index 9c29648626..fbdce11819 100644 --- a/nipype/algorithms/tests/test_rapidart.py +++ b/nipype/algorithms/tests/test_rapidart.py @@ -1,8 +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 division - import numpy as np import numpy.testing as npt diff --git a/nipype/caching/memory.py b/nipype/caching/memory.py index 9fcf694d4b..53bf92cce7 100644 --- a/nipype/caching/memory.py +++ b/nipype/caching/memory.py @@ -3,10 +3,6 @@ Using nipype with persistence and lazy recomputation but without explicit name-steps pipeline: getting back scope in command-line based programming. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import object, open - import os import hashlib import pickle diff --git a/nipype/external/fsl_imglob.py b/nipype/external/fsl_imglob.py index 3b9a4eea4d..ea4cfe245a 100755 --- a/nipype/external/fsl_imglob.py +++ b/nipype/external/fsl_imglob.py @@ -63,7 +63,6 @@ # Innovation Limited ("Isis"), the technology transfer company of the # University, to negotiate a licence. Contact details are: # innovation@isis.ox.ac.uk quoting reference DE/9564. -from __future__ import print_function import sys import glob from builtins import range diff --git a/nipype/info.py b/nipype/info.py index 4e9055c7ea..9858e045dc 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -2,10 +2,6 @@ settings in setup.py, the nipy top-level docstring, and for building the docs. In setup.py in particular, we exec this file, so it cannot import nipy """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) - -import sys # nipype version information # Remove -dev for release @@ -54,13 +50,12 @@ def get_nipype_gitversion(): 'License :: OSI Approved :: Apache Software License', 'Operating System :: MacOS :: MacOS X', 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Topic :: Scientific/Engineering' ] -PYTHON_REQUIRES = ">= 2.7, != 3.0.*, != 3.1.*, != 3.2.*, != 3.3.*, != 3.4.*" +PYTHON_REQUIRES = ">= 3.5" description = 'Neuroimaging in Python: Pipelines and Interfaces' @@ -106,9 +101,6 @@ def get_nipype_gitversion(): # Numpy bug in python 3.7: # https://www.opensourceanswers.com/blog/you-shouldnt-use-python-37-for-data-science-right-now.html NUMPY_MIN_VERSION_37 = '1.15.3' -NUMPY_BAD_VERSION_27 = '1.16.0' -# Numpy drops 2.7 support in 1.17 -NUMPY_MAX_VERSION_27 = '1.17.0' SCIPY_MIN_VERSION = '0.14' # Scipy drops 2.7 and 3.4 support in 1.3 SCIPY_MAX_VERSION_34 = '1.3.0' @@ -140,26 +132,18 @@ def get_nipype_gitversion(): PROVIDES = ['nipype'] REQUIRES = [ 'click>=%s' % CLICK_MIN_VERSION, - 'configparser; python_version <= "3.4"', 'funcsigs', 'future>=%s' % FUTURE_MIN_VERSION, - 'futures; python_version == "2.7"', - 'networkx>=%s ; python_version >= "3.0"' % NETWORKX_MIN_VERSION, - 'networkx>=%s,<=%s ; python_version < "3.0"' % (NETWORKX_MIN_VERSION, NETWORKX_MAX_VERSION_27), + 'networkx>=%s' % NETWORKX_MIN_VERSION, 'nibabel>=%s' % NIBABEL_MIN_VERSION, - 'numpy>=%s ; python_version > "3.0" and python_version < "3.7"' % NUMPY_MIN_VERSION, + 'numpy>=%s ; python_version < "3.7"' % NUMPY_MIN_VERSION, 'numpy>=%s ; python_version >= "3.7"' % NUMPY_MIN_VERSION_37, - 'numpy>=%s,!=%s,<%s ; python_version == "2.7"' % (NUMPY_MIN_VERSION, - NUMPY_BAD_VERSION_27, - NUMPY_MAX_VERSION_27), 'packaging', - 'pathlib2; python_version <= "3.4"', 'prov>=%s' % PROV_VERSION, 'pydot>=%s' % PYDOT_MIN_VERSION, 'pydotplus', 'python-dateutil>=%s' % DATEUTIL_MIN_VERSION, - 'scipy>=%s ; python_version >= "3.5"' % SCIPY_MIN_VERSION, - 'scipy>=%s,<%s ; python_version <= "3.4"' % (SCIPY_MIN_VERSION, SCIPY_MAX_VERSION_34), + 'scipy>=%s' % SCIPY_MIN_VERSION, 'simplejson>=%s' % SIMPLEJSON_MIN_VERSION, 'traits>=%s,!=5.0' % TRAITS_MIN_VERSION, 'filelock>=3.0.0', diff --git a/nipype/interfaces/__init__.py b/nipype/interfaces/__init__.py index a19efa64e5..7ad7166476 100644 --- a/nipype/interfaces/__init__.py +++ b/nipype/interfaces/__init__.py @@ -6,8 +6,6 @@ Requires Packages to be installed """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) __docformat__ = 'restructuredtext' from .io import DataGrabber, DataSink, SelectFiles, BIDSDataGrabber diff --git a/nipype/interfaces/afni/base.py b/nipype/interfaces/afni/base.py index 1a21dcb2cf..f83b40c4be 100644 --- a/nipype/interfaces/afni/base.py +++ b/nipype/interfaces/afni/base.py @@ -2,10 +2,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: """Provide interface to AFNI commands.""" -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from future.utils import raise_from - import os from sys import platform from distutils import spawn @@ -63,7 +59,7 @@ def output_type_to_ext(cls, outputtype): return cls.ftypes[outputtype] except KeyError as e: msg = 'Invalid AFNIOUTPUTTYPE: ', outputtype - raise_from(KeyError(msg), e) + raise KeyError(msg) from e @classmethod def outputtype(cls): diff --git a/nipype/interfaces/afni/model.py b/nipype/interfaces/afni/model.py index ff6994b374..efc4bf7b59 100644 --- a/nipype/interfaces/afni/model.py +++ b/nipype/interfaces/afni/model.py @@ -9,8 +9,6 @@ See the docstrings of the individual classes for examples. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os diff --git a/nipype/interfaces/afni/preprocess.py b/nipype/interfaces/afni/preprocess.py index a5a992452d..17b23a2491 100644 --- a/nipype/interfaces/afni/preprocess.py +++ b/nipype/interfaces/afni/preprocess.py @@ -2,9 +2,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: """AFNI preprocessing interfaces.""" -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open import os import os.path as op diff --git a/nipype/interfaces/afni/svm.py b/nipype/interfaces/afni/svm.py index 4a813ddb7e..0453778642 100644 --- a/nipype/interfaces/afni/svm.py +++ b/nipype/interfaces/afni/svm.py @@ -1,9 +1,7 @@ # -*- 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: +# vi: set ft=python sts=4 ts=4 sw=4 et: """AFNI's svm interfaces.""" -from __future__ import (print_function, division, unicode_literals, - absolute_import) from ..base import TraitedSpec, traits, File from .base import AFNICommand, AFNICommandInputSpec, AFNICommandOutputSpec diff --git a/nipype/interfaces/afni/tests/test_auto_ABoverlap.py b/nipype/interfaces/afni/tests/test_auto_ABoverlap.py index db17259c17..5fe7d2efd7 100644 --- a/nipype/interfaces/afni/tests/test_auto_ABoverlap.py +++ b/nipype/interfaces/afni/tests/test_auto_ABoverlap.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ABoverlap diff --git a/nipype/interfaces/afni/tests/test_auto_AFNICommand.py b/nipype/interfaces/afni/tests/test_auto_AFNICommand.py index f5b7184391..17f152c304 100644 --- a/nipype/interfaces/afni/tests/test_auto_AFNICommand.py +++ b/nipype/interfaces/afni/tests/test_auto_AFNICommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import AFNICommand diff --git a/nipype/interfaces/afni/tests/test_auto_AFNICommandBase.py b/nipype/interfaces/afni/tests/test_auto_AFNICommandBase.py index 431baec30b..ce0a85708c 100644 --- a/nipype/interfaces/afni/tests/test_auto_AFNICommandBase.py +++ b/nipype/interfaces/afni/tests/test_auto_AFNICommandBase.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import AFNICommandBase diff --git a/nipype/interfaces/afni/tests/test_auto_AFNIPythonCommand.py b/nipype/interfaces/afni/tests/test_auto_AFNIPythonCommand.py index e530fc1309..d9e3508113 100644 --- a/nipype/interfaces/afni/tests/test_auto_AFNIPythonCommand.py +++ b/nipype/interfaces/afni/tests/test_auto_AFNIPythonCommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import AFNIPythonCommand diff --git a/nipype/interfaces/afni/tests/test_auto_AFNItoNIFTI.py b/nipype/interfaces/afni/tests/test_auto_AFNItoNIFTI.py index 0c8bf19a7a..df58646223 100644 --- a/nipype/interfaces/afni/tests/test_auto_AFNItoNIFTI.py +++ b/nipype/interfaces/afni/tests/test_auto_AFNItoNIFTI.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import AFNItoNIFTI diff --git a/nipype/interfaces/afni/tests/test_auto_AlignEpiAnatPy.py b/nipype/interfaces/afni/tests/test_auto_AlignEpiAnatPy.py index d177480726..cb2389e67b 100644 --- a/nipype/interfaces/afni/tests/test_auto_AlignEpiAnatPy.py +++ b/nipype/interfaces/afni/tests/test_auto_AlignEpiAnatPy.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import AlignEpiAnatPy diff --git a/nipype/interfaces/afni/tests/test_auto_Allineate.py b/nipype/interfaces/afni/tests/test_auto_Allineate.py index e1565376bd..0891e60621 100644 --- a/nipype/interfaces/afni/tests/test_auto_Allineate.py +++ b/nipype/interfaces/afni/tests/test_auto_Allineate.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Allineate diff --git a/nipype/interfaces/afni/tests/test_auto_AutoTLRC.py b/nipype/interfaces/afni/tests/test_auto_AutoTLRC.py index 8d251a9620..337835e5d1 100644 --- a/nipype/interfaces/afni/tests/test_auto_AutoTLRC.py +++ b/nipype/interfaces/afni/tests/test_auto_AutoTLRC.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import AutoTLRC diff --git a/nipype/interfaces/afni/tests/test_auto_AutoTcorrelate.py b/nipype/interfaces/afni/tests/test_auto_AutoTcorrelate.py index 34c99aa0c0..3ddf4ef69c 100644 --- a/nipype/interfaces/afni/tests/test_auto_AutoTcorrelate.py +++ b/nipype/interfaces/afni/tests/test_auto_AutoTcorrelate.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import AutoTcorrelate diff --git a/nipype/interfaces/afni/tests/test_auto_Autobox.py b/nipype/interfaces/afni/tests/test_auto_Autobox.py index ab7826469e..4837cf2d50 100644 --- a/nipype/interfaces/afni/tests/test_auto_Autobox.py +++ b/nipype/interfaces/afni/tests/test_auto_Autobox.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Autobox diff --git a/nipype/interfaces/afni/tests/test_auto_Automask.py b/nipype/interfaces/afni/tests/test_auto_Automask.py index 223419ad71..052c143f79 100644 --- a/nipype/interfaces/afni/tests/test_auto_Automask.py +++ b/nipype/interfaces/afni/tests/test_auto_Automask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Automask diff --git a/nipype/interfaces/afni/tests/test_auto_Axialize.py b/nipype/interfaces/afni/tests/test_auto_Axialize.py index b89957b6f9..0b14be386d 100644 --- a/nipype/interfaces/afni/tests/test_auto_Axialize.py +++ b/nipype/interfaces/afni/tests/test_auto_Axialize.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Axialize diff --git a/nipype/interfaces/afni/tests/test_auto_Bandpass.py b/nipype/interfaces/afni/tests/test_auto_Bandpass.py index c4a3be3022..d8e54e0211 100644 --- a/nipype/interfaces/afni/tests/test_auto_Bandpass.py +++ b/nipype/interfaces/afni/tests/test_auto_Bandpass.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Bandpass diff --git a/nipype/interfaces/afni/tests/test_auto_BlurInMask.py b/nipype/interfaces/afni/tests/test_auto_BlurInMask.py index bf42a587b7..86c62f56eb 100644 --- a/nipype/interfaces/afni/tests/test_auto_BlurInMask.py +++ b/nipype/interfaces/afni/tests/test_auto_BlurInMask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import BlurInMask diff --git a/nipype/interfaces/afni/tests/test_auto_BlurToFWHM.py b/nipype/interfaces/afni/tests/test_auto_BlurToFWHM.py index 38864aa09f..35f8b2bb80 100644 --- a/nipype/interfaces/afni/tests/test_auto_BlurToFWHM.py +++ b/nipype/interfaces/afni/tests/test_auto_BlurToFWHM.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import BlurToFWHM diff --git a/nipype/interfaces/afni/tests/test_auto_BrickStat.py b/nipype/interfaces/afni/tests/test_auto_BrickStat.py index d7f36eb79b..d1119bc1e5 100644 --- a/nipype/interfaces/afni/tests/test_auto_BrickStat.py +++ b/nipype/interfaces/afni/tests/test_auto_BrickStat.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import BrickStat diff --git a/nipype/interfaces/afni/tests/test_auto_Bucket.py b/nipype/interfaces/afni/tests/test_auto_Bucket.py index dfd28d6ccd..7410a5c70b 100644 --- a/nipype/interfaces/afni/tests/test_auto_Bucket.py +++ b/nipype/interfaces/afni/tests/test_auto_Bucket.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Bucket diff --git a/nipype/interfaces/afni/tests/test_auto_Calc.py b/nipype/interfaces/afni/tests/test_auto_Calc.py index 677cd5dbbf..f7da2d3a5e 100644 --- a/nipype/interfaces/afni/tests/test_auto_Calc.py +++ b/nipype/interfaces/afni/tests/test_auto_Calc.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Calc diff --git a/nipype/interfaces/afni/tests/test_auto_Cat.py b/nipype/interfaces/afni/tests/test_auto_Cat.py index 50806add01..01bfc29781 100644 --- a/nipype/interfaces/afni/tests/test_auto_Cat.py +++ b/nipype/interfaces/afni/tests/test_auto_Cat.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Cat diff --git a/nipype/interfaces/afni/tests/test_auto_CatMatvec.py b/nipype/interfaces/afni/tests/test_auto_CatMatvec.py index 2250878719..117b64d0ea 100644 --- a/nipype/interfaces/afni/tests/test_auto_CatMatvec.py +++ b/nipype/interfaces/afni/tests/test_auto_CatMatvec.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import CatMatvec diff --git a/nipype/interfaces/afni/tests/test_auto_CenterMass.py b/nipype/interfaces/afni/tests/test_auto_CenterMass.py index 41eddd5ed7..9fe4acf7db 100644 --- a/nipype/interfaces/afni/tests/test_auto_CenterMass.py +++ b/nipype/interfaces/afni/tests/test_auto_CenterMass.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import CenterMass diff --git a/nipype/interfaces/afni/tests/test_auto_ClipLevel.py b/nipype/interfaces/afni/tests/test_auto_ClipLevel.py index 96f928a809..95152081ca 100644 --- a/nipype/interfaces/afni/tests/test_auto_ClipLevel.py +++ b/nipype/interfaces/afni/tests/test_auto_ClipLevel.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import ClipLevel diff --git a/nipype/interfaces/afni/tests/test_auto_ConvertDset.py b/nipype/interfaces/afni/tests/test_auto_ConvertDset.py index 39613d7981..41f816dfc7 100644 --- a/nipype/interfaces/afni/tests/test_auto_ConvertDset.py +++ b/nipype/interfaces/afni/tests/test_auto_ConvertDset.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ConvertDset diff --git a/nipype/interfaces/afni/tests/test_auto_Copy.py b/nipype/interfaces/afni/tests/test_auto_Copy.py index 447fcaa24f..9a716722e1 100644 --- a/nipype/interfaces/afni/tests/test_auto_Copy.py +++ b/nipype/interfaces/afni/tests/test_auto_Copy.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Copy diff --git a/nipype/interfaces/afni/tests/test_auto_Deconvolve.py b/nipype/interfaces/afni/tests/test_auto_Deconvolve.py index 713589dbc0..c6969bbbe6 100644 --- a/nipype/interfaces/afni/tests/test_auto_Deconvolve.py +++ b/nipype/interfaces/afni/tests/test_auto_Deconvolve.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import Deconvolve diff --git a/nipype/interfaces/afni/tests/test_auto_DegreeCentrality.py b/nipype/interfaces/afni/tests/test_auto_DegreeCentrality.py index 721f161af3..183745d2cb 100644 --- a/nipype/interfaces/afni/tests/test_auto_DegreeCentrality.py +++ b/nipype/interfaces/afni/tests/test_auto_DegreeCentrality.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import DegreeCentrality diff --git a/nipype/interfaces/afni/tests/test_auto_Despike.py b/nipype/interfaces/afni/tests/test_auto_Despike.py index cb495e9c5b..9d955e11d2 100644 --- a/nipype/interfaces/afni/tests/test_auto_Despike.py +++ b/nipype/interfaces/afni/tests/test_auto_Despike.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Despike diff --git a/nipype/interfaces/afni/tests/test_auto_Detrend.py b/nipype/interfaces/afni/tests/test_auto_Detrend.py index 6c1bd3cbba..227f7585ac 100644 --- a/nipype/interfaces/afni/tests/test_auto_Detrend.py +++ b/nipype/interfaces/afni/tests/test_auto_Detrend.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Detrend diff --git a/nipype/interfaces/afni/tests/test_auto_Dot.py b/nipype/interfaces/afni/tests/test_auto_Dot.py index 66e535dc54..561be9cd93 100644 --- a/nipype/interfaces/afni/tests/test_auto_Dot.py +++ b/nipype/interfaces/afni/tests/test_auto_Dot.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Dot diff --git a/nipype/interfaces/afni/tests/test_auto_ECM.py b/nipype/interfaces/afni/tests/test_auto_ECM.py index 9f69ea3c69..0bcc8f005e 100644 --- a/nipype/interfaces/afni/tests/test_auto_ECM.py +++ b/nipype/interfaces/afni/tests/test_auto_ECM.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import ECM diff --git a/nipype/interfaces/afni/tests/test_auto_Edge3.py b/nipype/interfaces/afni/tests/test_auto_Edge3.py index 722037d2d1..e15dc131b8 100644 --- a/nipype/interfaces/afni/tests/test_auto_Edge3.py +++ b/nipype/interfaces/afni/tests/test_auto_Edge3.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Edge3 diff --git a/nipype/interfaces/afni/tests/test_auto_Eval.py b/nipype/interfaces/afni/tests/test_auto_Eval.py index 9f29aa0b91..475898c32a 100644 --- a/nipype/interfaces/afni/tests/test_auto_Eval.py +++ b/nipype/interfaces/afni/tests/test_auto_Eval.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Eval diff --git a/nipype/interfaces/afni/tests/test_auto_FWHMx.py b/nipype/interfaces/afni/tests/test_auto_FWHMx.py index ac2fdffbb0..8d7d7d234c 100644 --- a/nipype/interfaces/afni/tests/test_auto_FWHMx.py +++ b/nipype/interfaces/afni/tests/test_auto_FWHMx.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import FWHMx diff --git a/nipype/interfaces/afni/tests/test_auto_Fim.py b/nipype/interfaces/afni/tests/test_auto_Fim.py index 8550747727..49cf009096 100644 --- a/nipype/interfaces/afni/tests/test_auto_Fim.py +++ b/nipype/interfaces/afni/tests/test_auto_Fim.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Fim diff --git a/nipype/interfaces/afni/tests/test_auto_Fourier.py b/nipype/interfaces/afni/tests/test_auto_Fourier.py index ee3dd6672a..1f1ef8bc4f 100644 --- a/nipype/interfaces/afni/tests/test_auto_Fourier.py +++ b/nipype/interfaces/afni/tests/test_auto_Fourier.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Fourier diff --git a/nipype/interfaces/afni/tests/test_auto_GCOR.py b/nipype/interfaces/afni/tests/test_auto_GCOR.py index 60dfd9f7b3..98708d79fa 100644 --- a/nipype/interfaces/afni/tests/test_auto_GCOR.py +++ b/nipype/interfaces/afni/tests/test_auto_GCOR.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import GCOR diff --git a/nipype/interfaces/afni/tests/test_auto_Hist.py b/nipype/interfaces/afni/tests/test_auto_Hist.py index 65f4b0566b..92ce044053 100644 --- a/nipype/interfaces/afni/tests/test_auto_Hist.py +++ b/nipype/interfaces/afni/tests/test_auto_Hist.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Hist diff --git a/nipype/interfaces/afni/tests/test_auto_LFCD.py b/nipype/interfaces/afni/tests/test_auto_LFCD.py index 51a5fffb68..11c6857ccc 100644 --- a/nipype/interfaces/afni/tests/test_auto_LFCD.py +++ b/nipype/interfaces/afni/tests/test_auto_LFCD.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import LFCD diff --git a/nipype/interfaces/afni/tests/test_auto_LocalBistat.py b/nipype/interfaces/afni/tests/test_auto_LocalBistat.py index 4632e4cf7d..91e96d9eed 100644 --- a/nipype/interfaces/afni/tests/test_auto_LocalBistat.py +++ b/nipype/interfaces/afni/tests/test_auto_LocalBistat.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import LocalBistat diff --git a/nipype/interfaces/afni/tests/test_auto_Localstat.py b/nipype/interfaces/afni/tests/test_auto_Localstat.py index 62dc800941..e7b4089474 100644 --- a/nipype/interfaces/afni/tests/test_auto_Localstat.py +++ b/nipype/interfaces/afni/tests/test_auto_Localstat.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Localstat diff --git a/nipype/interfaces/afni/tests/test_auto_MaskTool.py b/nipype/interfaces/afni/tests/test_auto_MaskTool.py index 070686dd8d..1b3be1de0e 100644 --- a/nipype/interfaces/afni/tests/test_auto_MaskTool.py +++ b/nipype/interfaces/afni/tests/test_auto_MaskTool.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MaskTool diff --git a/nipype/interfaces/afni/tests/test_auto_Maskave.py b/nipype/interfaces/afni/tests/test_auto_Maskave.py index 9185f94266..f322d55fa8 100644 --- a/nipype/interfaces/afni/tests/test_auto_Maskave.py +++ b/nipype/interfaces/afni/tests/test_auto_Maskave.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Maskave diff --git a/nipype/interfaces/afni/tests/test_auto_Means.py b/nipype/interfaces/afni/tests/test_auto_Means.py index 9db304bb3d..9a6d759123 100644 --- a/nipype/interfaces/afni/tests/test_auto_Means.py +++ b/nipype/interfaces/afni/tests/test_auto_Means.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Means diff --git a/nipype/interfaces/afni/tests/test_auto_Merge.py b/nipype/interfaces/afni/tests/test_auto_Merge.py index 934bf17b96..30b838620e 100644 --- a/nipype/interfaces/afni/tests/test_auto_Merge.py +++ b/nipype/interfaces/afni/tests/test_auto_Merge.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Merge diff --git a/nipype/interfaces/afni/tests/test_auto_Notes.py b/nipype/interfaces/afni/tests/test_auto_Notes.py index 51084ba3b9..65365e0829 100644 --- a/nipype/interfaces/afni/tests/test_auto_Notes.py +++ b/nipype/interfaces/afni/tests/test_auto_Notes.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Notes diff --git a/nipype/interfaces/afni/tests/test_auto_NwarpAdjust.py b/nipype/interfaces/afni/tests/test_auto_NwarpAdjust.py index c4c8dc6804..e3882d3559 100644 --- a/nipype/interfaces/afni/tests/test_auto_NwarpAdjust.py +++ b/nipype/interfaces/afni/tests/test_auto_NwarpAdjust.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import NwarpAdjust diff --git a/nipype/interfaces/afni/tests/test_auto_NwarpApply.py b/nipype/interfaces/afni/tests/test_auto_NwarpApply.py index 87388c65ec..490f296d3b 100644 --- a/nipype/interfaces/afni/tests/test_auto_NwarpApply.py +++ b/nipype/interfaces/afni/tests/test_auto_NwarpApply.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import NwarpApply diff --git a/nipype/interfaces/afni/tests/test_auto_NwarpCat.py b/nipype/interfaces/afni/tests/test_auto_NwarpCat.py index b5724c98dd..666de06590 100644 --- a/nipype/interfaces/afni/tests/test_auto_NwarpCat.py +++ b/nipype/interfaces/afni/tests/test_auto_NwarpCat.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import NwarpCat diff --git a/nipype/interfaces/afni/tests/test_auto_OneDToolPy.py b/nipype/interfaces/afni/tests/test_auto_OneDToolPy.py index 114fe53fba..3024c438c8 100644 --- a/nipype/interfaces/afni/tests/test_auto_OneDToolPy.py +++ b/nipype/interfaces/afni/tests/test_auto_OneDToolPy.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import OneDToolPy diff --git a/nipype/interfaces/afni/tests/test_auto_OutlierCount.py b/nipype/interfaces/afni/tests/test_auto_OutlierCount.py index 2a1eb61af3..f630daf9f6 100644 --- a/nipype/interfaces/afni/tests/test_auto_OutlierCount.py +++ b/nipype/interfaces/afni/tests/test_auto_OutlierCount.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import OutlierCount diff --git a/nipype/interfaces/afni/tests/test_auto_QualityIndex.py b/nipype/interfaces/afni/tests/test_auto_QualityIndex.py index 27fd6727c4..209353e4dc 100644 --- a/nipype/interfaces/afni/tests/test_auto_QualityIndex.py +++ b/nipype/interfaces/afni/tests/test_auto_QualityIndex.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import QualityIndex diff --git a/nipype/interfaces/afni/tests/test_auto_Qwarp.py b/nipype/interfaces/afni/tests/test_auto_Qwarp.py index 0b8a9e38ec..877dd82fb2 100644 --- a/nipype/interfaces/afni/tests/test_auto_Qwarp.py +++ b/nipype/interfaces/afni/tests/test_auto_Qwarp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Qwarp diff --git a/nipype/interfaces/afni/tests/test_auto_QwarpPlusMinus.py b/nipype/interfaces/afni/tests/test_auto_QwarpPlusMinus.py index e282d0d0a5..5066483014 100644 --- a/nipype/interfaces/afni/tests/test_auto_QwarpPlusMinus.py +++ b/nipype/interfaces/afni/tests/test_auto_QwarpPlusMinus.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import QwarpPlusMinus diff --git a/nipype/interfaces/afni/tests/test_auto_ROIStats.py b/nipype/interfaces/afni/tests/test_auto_ROIStats.py index c7fc517ccc..f71c3158cd 100644 --- a/nipype/interfaces/afni/tests/test_auto_ROIStats.py +++ b/nipype/interfaces/afni/tests/test_auto_ROIStats.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import ROIStats diff --git a/nipype/interfaces/afni/tests/test_auto_ReHo.py b/nipype/interfaces/afni/tests/test_auto_ReHo.py index cf3e468159..2e0c3fb6eb 100644 --- a/nipype/interfaces/afni/tests/test_auto_ReHo.py +++ b/nipype/interfaces/afni/tests/test_auto_ReHo.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ReHo diff --git a/nipype/interfaces/afni/tests/test_auto_Refit.py b/nipype/interfaces/afni/tests/test_auto_Refit.py index c289f94ce5..fd7688dce4 100644 --- a/nipype/interfaces/afni/tests/test_auto_Refit.py +++ b/nipype/interfaces/afni/tests/test_auto_Refit.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Refit diff --git a/nipype/interfaces/afni/tests/test_auto_Remlfit.py b/nipype/interfaces/afni/tests/test_auto_Remlfit.py index b1afa427b1..0ace6a1b04 100644 --- a/nipype/interfaces/afni/tests/test_auto_Remlfit.py +++ b/nipype/interfaces/afni/tests/test_auto_Remlfit.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import Remlfit diff --git a/nipype/interfaces/afni/tests/test_auto_Resample.py b/nipype/interfaces/afni/tests/test_auto_Resample.py index f63e1347f5..f2c7456a6a 100644 --- a/nipype/interfaces/afni/tests/test_auto_Resample.py +++ b/nipype/interfaces/afni/tests/test_auto_Resample.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Resample diff --git a/nipype/interfaces/afni/tests/test_auto_Retroicor.py b/nipype/interfaces/afni/tests/test_auto_Retroicor.py index 49f3c5ec98..9e3c10631c 100644 --- a/nipype/interfaces/afni/tests/test_auto_Retroicor.py +++ b/nipype/interfaces/afni/tests/test_auto_Retroicor.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Retroicor diff --git a/nipype/interfaces/afni/tests/test_auto_SVMTest.py b/nipype/interfaces/afni/tests/test_auto_SVMTest.py index 98654e36f3..79f33834e9 100644 --- a/nipype/interfaces/afni/tests/test_auto_SVMTest.py +++ b/nipype/interfaces/afni/tests/test_auto_SVMTest.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..svm import SVMTest diff --git a/nipype/interfaces/afni/tests/test_auto_SVMTrain.py b/nipype/interfaces/afni/tests/test_auto_SVMTrain.py index 03e2d95e52..307b8628f8 100644 --- a/nipype/interfaces/afni/tests/test_auto_SVMTrain.py +++ b/nipype/interfaces/afni/tests/test_auto_SVMTrain.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..svm import SVMTrain diff --git a/nipype/interfaces/afni/tests/test_auto_Seg.py b/nipype/interfaces/afni/tests/test_auto_Seg.py index 56720a7e38..a5d475d9a0 100644 --- a/nipype/interfaces/afni/tests/test_auto_Seg.py +++ b/nipype/interfaces/afni/tests/test_auto_Seg.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Seg diff --git a/nipype/interfaces/afni/tests/test_auto_SkullStrip.py b/nipype/interfaces/afni/tests/test_auto_SkullStrip.py index 6fc8d3ad3d..c198b0172a 100644 --- a/nipype/interfaces/afni/tests/test_auto_SkullStrip.py +++ b/nipype/interfaces/afni/tests/test_auto_SkullStrip.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import SkullStrip diff --git a/nipype/interfaces/afni/tests/test_auto_Synthesize.py b/nipype/interfaces/afni/tests/test_auto_Synthesize.py index 8c7ee9afaf..2c71bd41b7 100644 --- a/nipype/interfaces/afni/tests/test_auto_Synthesize.py +++ b/nipype/interfaces/afni/tests/test_auto_Synthesize.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import Synthesize diff --git a/nipype/interfaces/afni/tests/test_auto_TCat.py b/nipype/interfaces/afni/tests/test_auto_TCat.py index 042916893e..acd3ec7b27 100644 --- a/nipype/interfaces/afni/tests/test_auto_TCat.py +++ b/nipype/interfaces/afni/tests/test_auto_TCat.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import TCat diff --git a/nipype/interfaces/afni/tests/test_auto_TCatSubBrick.py b/nipype/interfaces/afni/tests/test_auto_TCatSubBrick.py index 4f60118e35..516c2d15d0 100644 --- a/nipype/interfaces/afni/tests/test_auto_TCatSubBrick.py +++ b/nipype/interfaces/afni/tests/test_auto_TCatSubBrick.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import TCatSubBrick diff --git a/nipype/interfaces/afni/tests/test_auto_TCorr1D.py b/nipype/interfaces/afni/tests/test_auto_TCorr1D.py index 5fe7fffb81..a87efb29da 100644 --- a/nipype/interfaces/afni/tests/test_auto_TCorr1D.py +++ b/nipype/interfaces/afni/tests/test_auto_TCorr1D.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import TCorr1D diff --git a/nipype/interfaces/afni/tests/test_auto_TCorrMap.py b/nipype/interfaces/afni/tests/test_auto_TCorrMap.py index 209473fe6f..364a19af41 100644 --- a/nipype/interfaces/afni/tests/test_auto_TCorrMap.py +++ b/nipype/interfaces/afni/tests/test_auto_TCorrMap.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import TCorrMap diff --git a/nipype/interfaces/afni/tests/test_auto_TCorrelate.py b/nipype/interfaces/afni/tests/test_auto_TCorrelate.py index fd3569b0bf..3e75c7d099 100644 --- a/nipype/interfaces/afni/tests/test_auto_TCorrelate.py +++ b/nipype/interfaces/afni/tests/test_auto_TCorrelate.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import TCorrelate diff --git a/nipype/interfaces/afni/tests/test_auto_TNorm.py b/nipype/interfaces/afni/tests/test_auto_TNorm.py index a8ba790aa1..144e0fdeba 100644 --- a/nipype/interfaces/afni/tests/test_auto_TNorm.py +++ b/nipype/interfaces/afni/tests/test_auto_TNorm.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import TNorm diff --git a/nipype/interfaces/afni/tests/test_auto_TProject.py b/nipype/interfaces/afni/tests/test_auto_TProject.py index 66f7caadc4..897b18c853 100644 --- a/nipype/interfaces/afni/tests/test_auto_TProject.py +++ b/nipype/interfaces/afni/tests/test_auto_TProject.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import TProject diff --git a/nipype/interfaces/afni/tests/test_auto_TShift.py b/nipype/interfaces/afni/tests/test_auto_TShift.py index 14d58011a9..7b6589df5f 100644 --- a/nipype/interfaces/afni/tests/test_auto_TShift.py +++ b/nipype/interfaces/afni/tests/test_auto_TShift.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import TShift diff --git a/nipype/interfaces/afni/tests/test_auto_TSmooth.py b/nipype/interfaces/afni/tests/test_auto_TSmooth.py index cbcc871bc7..67c4821ed2 100644 --- a/nipype/interfaces/afni/tests/test_auto_TSmooth.py +++ b/nipype/interfaces/afni/tests/test_auto_TSmooth.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import TSmooth diff --git a/nipype/interfaces/afni/tests/test_auto_TStat.py b/nipype/interfaces/afni/tests/test_auto_TStat.py index 8f2da6aeff..1b0949ce40 100644 --- a/nipype/interfaces/afni/tests/test_auto_TStat.py +++ b/nipype/interfaces/afni/tests/test_auto_TStat.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import TStat diff --git a/nipype/interfaces/afni/tests/test_auto_To3D.py b/nipype/interfaces/afni/tests/test_auto_To3D.py index 90946f4e79..86d64804a7 100644 --- a/nipype/interfaces/afni/tests/test_auto_To3D.py +++ b/nipype/interfaces/afni/tests/test_auto_To3D.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import To3D diff --git a/nipype/interfaces/afni/tests/test_auto_Undump.py b/nipype/interfaces/afni/tests/test_auto_Undump.py index fad4bfc94f..d5c2dabdfc 100644 --- a/nipype/interfaces/afni/tests/test_auto_Undump.py +++ b/nipype/interfaces/afni/tests/test_auto_Undump.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Undump diff --git a/nipype/interfaces/afni/tests/test_auto_Unifize.py b/nipype/interfaces/afni/tests/test_auto_Unifize.py index 77b0bed4df..73156ba847 100644 --- a/nipype/interfaces/afni/tests/test_auto_Unifize.py +++ b/nipype/interfaces/afni/tests/test_auto_Unifize.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Unifize diff --git a/nipype/interfaces/afni/tests/test_auto_Volreg.py b/nipype/interfaces/afni/tests/test_auto_Volreg.py index 8aba661319..6f6f816a5d 100644 --- a/nipype/interfaces/afni/tests/test_auto_Volreg.py +++ b/nipype/interfaces/afni/tests/test_auto_Volreg.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Volreg diff --git a/nipype/interfaces/afni/tests/test_auto_Warp.py b/nipype/interfaces/afni/tests/test_auto_Warp.py index 024d979f41..1adc2c1a1d 100644 --- a/nipype/interfaces/afni/tests/test_auto_Warp.py +++ b/nipype/interfaces/afni/tests/test_auto_Warp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Warp diff --git a/nipype/interfaces/afni/tests/test_auto_ZCutUp.py b/nipype/interfaces/afni/tests/test_auto_ZCutUp.py index 2942acad85..5451e057c9 100644 --- a/nipype/interfaces/afni/tests/test_auto_ZCutUp.py +++ b/nipype/interfaces/afni/tests/test_auto_ZCutUp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ZCutUp diff --git a/nipype/interfaces/afni/tests/test_auto_Zcat.py b/nipype/interfaces/afni/tests/test_auto_Zcat.py index 13675f61b9..b226cf4a3a 100644 --- a/nipype/interfaces/afni/tests/test_auto_Zcat.py +++ b/nipype/interfaces/afni/tests/test_auto_Zcat.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Zcat diff --git a/nipype/interfaces/afni/tests/test_auto_Zeropad.py b/nipype/interfaces/afni/tests/test_auto_Zeropad.py index 1bd80cfad8..3f9352c567 100644 --- a/nipype/interfaces/afni/tests/test_auto_Zeropad.py +++ b/nipype/interfaces/afni/tests/test_auto_Zeropad.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Zeropad diff --git a/nipype/interfaces/afni/utils.py b/nipype/interfaces/afni/utils.py index b728d8c902..eb897ac110 100644 --- a/nipype/interfaces/afni/utils.py +++ b/nipype/interfaces/afni/utils.py @@ -9,10 +9,6 @@ See the docstrings of the individual classes for examples. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import str, bytes - import os import os.path as op import re diff --git a/nipype/interfaces/ants/base.py b/nipype/interfaces/ants/base.py index 34b64a0ec1..e27cfc0920 100644 --- a/nipype/interfaces/ants/base.py +++ b/nipype/interfaces/ants/base.py @@ -2,10 +2,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: """The ants module provides basic functions for interfacing with ANTS tools.""" -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import str - import os # Local imports diff --git a/nipype/interfaces/ants/legacy.py b/nipype/interfaces/ants/legacy.py deleted file mode 100644 index 40f2def728..0000000000 --- a/nipype/interfaces/ants/legacy.py +++ /dev/null @@ -1,325 +0,0 @@ -# -*- coding: utf-8 -*- -# NOTE: This implementation has been superceeded buy the antsApplyTransform -# implmeentation that more closely follows the strucutre and capabilities -# of the antsApplyTransform program. This implementation is here -# for backwards compatibility. -"""ANTS Apply Transforms interface -""" - -from builtins import range - -import os -from glob import glob - -from .base import ANTSCommand, ANTSCommandInputSpec -from ..base import TraitedSpec, File, traits, isdefined, OutputMultiPath -from ...utils.filemanip import split_filename - - -class antsIntroductionInputSpec(ANTSCommandInputSpec): - dimension = traits.Enum( - 3, - 2, - argstr='-d %d', - usedefault=True, - desc='image dimension (2 or 3)', - position=1) - reference_image = File( - exists=True, - argstr='-r %s', - desc='template file to warp to', - mandatory=True, - copyfile=True) - input_image = File( - exists=True, - argstr='-i %s', - desc='input image to warp to template', - mandatory=True, - copyfile=False) - force_proceed = traits.Bool( - argstr='-f 1', - desc=('force script to proceed even if headers ' - 'may be incompatible')) - inverse_warp_template_labels = traits.Bool( - argstr='-l', - desc=('Applies inverse warp to the template labels ' - 'to estimate label positions in target space (use ' - 'for template-based segmentation)')) - max_iterations = traits.List( - traits.Int, - argstr='-m %s', - sep='x', - desc=('maximum number of iterations (must be ' - 'list of integers in the form [J,K,L...]: ' - 'J = coarsest resolution iterations, K = ' - 'middle resolution interations, L = fine ' - 'resolution iterations')) - bias_field_correction = traits.Bool( - argstr='-n 1', - desc=('Applies bias field correction to moving ' - 'image')) - similarity_metric = traits.Enum( - 'PR', - 'CC', - 'MI', - 'MSQ', - argstr='-s %s', - desc=('Type of similartiy metric used for registration ' - '(CC = cross correlation, MI = mutual information, ' - 'PR = probability mapping, MSQ = mean square difference)')) - transformation_model = traits.Enum( - 'GR', - 'EL', - 'SY', - 'S2', - 'EX', - 'DD', - 'RI', - 'RA', - argstr='-t %s', - usedefault=True, - desc=('Type of transofmration model used for registration ' - '(EL = elastic transformation model, SY = SyN with time, ' - 'arbitrary number of time points, S2 = SyN with time ' - 'optimized for 2 time points, GR = greedy SyN, EX = ' - 'exponential, DD = diffeomorphic demons style exponential ' - 'mapping, RI = purely rigid, RA = affine rigid')) - out_prefix = traits.Str( - 'ants_', - argstr='-o %s', - usedefault=True, - desc=('Prefix that is prepended to all output ' - 'files (default = ants_)')) - quality_check = traits.Bool( - argstr='-q 1', desc='Perform a quality check of the result') - - -class antsIntroductionOutputSpec(TraitedSpec): - affine_transformation = File( - exists=True, desc='affine (prefix_Affine.txt)') - warp_field = File(exists=True, desc='warp field (prefix_Warp.nii)') - inverse_warp_field = File( - exists=True, desc='inverse warp field (prefix_InverseWarp.nii)') - input_file = File(exists=True, desc='input image (prefix_repaired.nii)') - output_file = File(exists=True, desc='output image (prefix_deformed.nii)') - - -class antsIntroduction(ANTSCommand): - """Uses ANTS to generate matrices to warp data from one space to another. - - Examples - -------- - - >>> from nipype.interfaces.ants.legacy import antsIntroduction - >>> warp = antsIntroduction() - >>> warp.inputs.reference_image = 'Template_6.nii' - >>> warp.inputs.input_image = 'structural.nii' - >>> warp.inputs.max_iterations = [30,90,20] - >>> warp.cmdline - 'antsIntroduction.sh -d 3 -i structural.nii -m 30x90x20 -o ants_ -r Template_6.nii -t GR' - - """ - - _cmd = 'antsIntroduction.sh' - input_spec = antsIntroductionInputSpec - output_spec = antsIntroductionOutputSpec - - def _list_outputs(self): - outputs = self._outputs().get() - transmodel = self.inputs.transformation_model - - # When transform is set as 'RI'/'RA', wrap fields should not be expected - # The default transformation is GR, which outputs the wrap fields - if not isdefined(transmodel) or (isdefined(transmodel) - and transmodel not in ['RI', 'RA']): - outputs['warp_field'] = os.path.join( - os.getcwd(), self.inputs.out_prefix + 'Warp.nii.gz') - outputs['inverse_warp_field'] = os.path.join( - os.getcwd(), self.inputs.out_prefix + 'InverseWarp.nii.gz') - - outputs['affine_transformation'] = os.path.join( - os.getcwd(), self.inputs.out_prefix + 'Affine.txt') - outputs['input_file'] = os.path.join( - os.getcwd(), self.inputs.out_prefix + 'repaired.nii.gz') - outputs['output_file'] = os.path.join( - os.getcwd(), self.inputs.out_prefix + 'deformed.nii.gz') - - return outputs - - -# How do we make a pass through so that GenWarpFields is just an alias for antsIntroduction ? - - -class GenWarpFields(antsIntroduction): - pass - - -class buildtemplateparallelInputSpec(ANTSCommandInputSpec): - dimension = traits.Enum( - 3, - 2, - 4, - argstr='-d %d', - usedefault=True, - desc='image dimension (2, 3 or 4)', - position=1) - out_prefix = traits.Str( - 'antsTMPL_', - argstr='-o %s', - usedefault=True, - desc=('Prefix that is prepended to all output ' - 'files (default = antsTMPL_)')) - in_files = traits.List( - File(exists=True), - mandatory=True, - desc='list of images to generate template from', - argstr='%s', - position=-1) - parallelization = traits.Enum( - 0, - 1, - 2, - argstr='-c %d', - usedefault=True, - desc=('control for parallel processing (0 = ' - 'serial, 1 = use PBS, 2 = use PEXEC, 3 = ' - 'use Apple XGrid')) - gradient_step_size = traits.Float( - argstr='-g %f', - desc=('smaller magnitude results in ' - 'more cautious steps (default = ' - '.25)')) - iteration_limit = traits.Int( - 4, - argstr='-i %d', - usedefault=True, - desc='iterations of template construction') - num_cores = traits.Int( - argstr='-j %d', - requires=['parallelization'], - desc=('Requires parallelization = 2 (PEXEC). ' - 'Sets number of cpu cores to use')) - max_iterations = traits.List( - traits.Int, - argstr='-m %s', - sep='x', - desc=('maximum number of iterations (must be ' - 'list of integers in the form [J,K,L...]: ' - 'J = coarsest resolution iterations, K = ' - 'middle resolution interations, L = fine ' - 'resolution iterations')) - bias_field_correction = traits.Bool( - argstr='-n 1', - desc=('Applies bias field correction to moving ' - 'image')) - rigid_body_registration = traits.Bool( - argstr='-r 1', - desc=('registers inputs before creating template ' - '(useful if no initial template available)')) - similarity_metric = traits.Enum( - 'PR', - 'CC', - 'MI', - 'MSQ', - argstr='-s %s', - desc=('Type of similartiy metric used for registration ' - '(CC = cross correlation, MI = mutual information, ' - 'PR = probability mapping, MSQ = mean square difference)')) - transformation_model = traits.Enum( - 'GR', - 'EL', - 'SY', - 'S2', - 'EX', - 'DD', - argstr='-t %s', - usedefault=True, - desc=('Type of transofmration model used for registration ' - '(EL = elastic transformation model, SY = SyN with time, ' - 'arbitrary number of time points, S2 = SyN with time ' - 'optimized for 2 time points, GR = greedy SyN, EX = ' - 'exponential, DD = diffeomorphic demons style exponential ' - 'mapping')) - use_first_as_target = traits.Bool( - desc=('uses first volume as target of ' - 'all inputs. When not used, an ' - 'unbiased average image is used ' - 'to start.')) - - -class buildtemplateparallelOutputSpec(TraitedSpec): - final_template_file = File(exists=True, desc='final ANTS template') - template_files = OutputMultiPath( - File(exists=True), desc='Templates from different stages of iteration') - subject_outfiles = OutputMultiPath( - File(exists=True), - desc=('Outputs for each input image. Includes warp ' - 'field, inverse warp, Affine, original image ' - '(repaired) and warped image (deformed)')) - - -class buildtemplateparallel(ANTSCommand): - """Generate a optimal average template - - .. warning:: - - This can take a VERY long time to complete - - Examples - -------- - - >>> from nipype.interfaces.ants.legacy import buildtemplateparallel - >>> tmpl = buildtemplateparallel() - >>> tmpl.inputs.in_files = ['T1.nii', 'structural.nii'] - >>> tmpl.inputs.max_iterations = [30, 90, 20] - >>> tmpl.cmdline - 'buildtemplateparallel.sh -d 3 -i 4 -m 30x90x20 -o antsTMPL_ -c 0 -t GR T1.nii structural.nii' - - """ - - _cmd = 'buildtemplateparallel.sh' - input_spec = buildtemplateparallelInputSpec - output_spec = buildtemplateparallelOutputSpec - - def _format_arg(self, opt, spec, val): - if opt == 'num_cores': - if self.inputs.parallelization == 2: - return '-j ' + str(val) - else: - return '' - if opt == 'in_files': - if self.inputs.use_first_as_target: - start = '-z ' - else: - start = '' - return start + ' '.join(name for name in val) - return super(buildtemplateparallel, self)._format_arg(opt, spec, val) - - def _list_outputs(self): - outputs = self._outputs().get() - outputs['template_files'] = [] - for i in range(len(glob(os.path.realpath('*iteration*')))): - temp = os.path.realpath('%s_iteration_%d/%stemplate.nii.gz' % - (self.inputs.transformation_model, i, - self.inputs.out_prefix)) - os.rename( - temp, - os.path.realpath('%s_iteration_%d/%stemplate_i%d.nii.gz' % - (self.inputs.transformation_model, i, - self.inputs.out_prefix, i))) - file_ = ('%s_iteration_%d/%stemplate_i%d.nii.gz' % - (self.inputs.transformation_model, i, - self.inputs.out_prefix, i)) - - outputs['template_files'].append(os.path.realpath(file_)) - outputs['final_template_file'] = \ - os.path.realpath('%stemplate.nii.gz' % - self.inputs.out_prefix) - outputs['subject_outfiles'] = [] - for filename in self.inputs.in_files: - _, base, _ = split_filename(filename) - temp = glob( - os.path.realpath('%s%s*' % (self.inputs.out_prefix, base))) - for file_ in temp: - outputs['subject_outfiles'].append(file_) - return outputs diff --git a/nipype/interfaces/ants/registration.py b/nipype/interfaces/ants/registration.py index c08c7646a9..2b85ea5923 100644 --- a/nipype/interfaces/ants/registration.py +++ b/nipype/interfaces/ants/registration.py @@ -2,9 +2,6 @@ """The ants module provides basic functions for interfacing with ants functions. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range, str import os from ...utils.filemanip import ensure_list diff --git a/nipype/interfaces/ants/resampling.py b/nipype/interfaces/ants/resampling.py index e26a48ed6a..94bccbdf7d 100644 --- a/nipype/interfaces/ants/resampling.py +++ b/nipype/interfaces/ants/resampling.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- """ANTS Apply Transforms interface """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range, str import os from .base import ANTSCommand, ANTSCommandInputSpec diff --git a/nipype/interfaces/ants/segmentation.py b/nipype/interfaces/ants/segmentation.py index eff769c628..e9966bf612 100644 --- a/nipype/interfaces/ants/segmentation.py +++ b/nipype/interfaces/ants/segmentation.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- """The ants module provides basic functions for interfacing with ants functions. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range, str - import os from ...external.due import BibTeX from ...utils.filemanip import split_filename, copyfile, which, fname_presuffix diff --git a/nipype/interfaces/ants/tests/test_auto_ANTS.py b/nipype/interfaces/ants/tests/test_auto_ANTS.py index 1ee5cabe21..3e762beaa9 100644 --- a/nipype/interfaces/ants/tests/test_auto_ANTS.py +++ b/nipype/interfaces/ants/tests/test_auto_ANTS.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import ANTS diff --git a/nipype/interfaces/ants/tests/test_auto_ANTSCommand.py b/nipype/interfaces/ants/tests/test_auto_ANTSCommand.py index 7423579ef7..54d1effe3a 100644 --- a/nipype/interfaces/ants/tests/test_auto_ANTSCommand.py +++ b/nipype/interfaces/ants/tests/test_auto_ANTSCommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import ANTSCommand diff --git a/nipype/interfaces/ants/tests/test_auto_AffineInitializer.py b/nipype/interfaces/ants/tests/test_auto_AffineInitializer.py index e2e1d3d53e..0ae65a48a2 100644 --- a/nipype/interfaces/ants/tests/test_auto_AffineInitializer.py +++ b/nipype/interfaces/ants/tests/test_auto_AffineInitializer.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import AffineInitializer diff --git a/nipype/interfaces/ants/tests/test_auto_AntsJointFusion.py b/nipype/interfaces/ants/tests/test_auto_AntsJointFusion.py index a2829be3fa..e4e6721d82 100644 --- a/nipype/interfaces/ants/tests/test_auto_AntsJointFusion.py +++ b/nipype/interfaces/ants/tests/test_auto_AntsJointFusion.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..segmentation import AntsJointFusion diff --git a/nipype/interfaces/ants/tests/test_auto_ApplyTransforms.py b/nipype/interfaces/ants/tests/test_auto_ApplyTransforms.py index d431323c0b..00a21dce13 100644 --- a/nipype/interfaces/ants/tests/test_auto_ApplyTransforms.py +++ b/nipype/interfaces/ants/tests/test_auto_ApplyTransforms.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..resampling import ApplyTransforms diff --git a/nipype/interfaces/ants/tests/test_auto_ApplyTransformsToPoints.py b/nipype/interfaces/ants/tests/test_auto_ApplyTransformsToPoints.py index c0b8f2d8f4..7ef77a6204 100644 --- a/nipype/interfaces/ants/tests/test_auto_ApplyTransformsToPoints.py +++ b/nipype/interfaces/ants/tests/test_auto_ApplyTransformsToPoints.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..resampling import ApplyTransformsToPoints diff --git a/nipype/interfaces/ants/tests/test_auto_Atropos.py b/nipype/interfaces/ants/tests/test_auto_Atropos.py index 73d7f6813a..bb7a2afe78 100644 --- a/nipype/interfaces/ants/tests/test_auto_Atropos.py +++ b/nipype/interfaces/ants/tests/test_auto_Atropos.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..segmentation import Atropos diff --git a/nipype/interfaces/ants/tests/test_auto_AverageAffineTransform.py b/nipype/interfaces/ants/tests/test_auto_AverageAffineTransform.py index a8646c482c..9247abda86 100644 --- a/nipype/interfaces/ants/tests/test_auto_AverageAffineTransform.py +++ b/nipype/interfaces/ants/tests/test_auto_AverageAffineTransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import AverageAffineTransform diff --git a/nipype/interfaces/ants/tests/test_auto_AverageImages.py b/nipype/interfaces/ants/tests/test_auto_AverageImages.py index fff94b8ec2..206d27d4bf 100644 --- a/nipype/interfaces/ants/tests/test_auto_AverageImages.py +++ b/nipype/interfaces/ants/tests/test_auto_AverageImages.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import AverageImages diff --git a/nipype/interfaces/ants/tests/test_auto_BrainExtraction.py b/nipype/interfaces/ants/tests/test_auto_BrainExtraction.py index 91861ac0b9..ba220afb9c 100644 --- a/nipype/interfaces/ants/tests/test_auto_BrainExtraction.py +++ b/nipype/interfaces/ants/tests/test_auto_BrainExtraction.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..segmentation import BrainExtraction diff --git a/nipype/interfaces/ants/tests/test_auto_ComposeMultiTransform.py b/nipype/interfaces/ants/tests/test_auto_ComposeMultiTransform.py index 1f71fd6c27..476f316a9f 100644 --- a/nipype/interfaces/ants/tests/test_auto_ComposeMultiTransform.py +++ b/nipype/interfaces/ants/tests/test_auto_ComposeMultiTransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ComposeMultiTransform diff --git a/nipype/interfaces/ants/tests/test_auto_CompositeTransformUtil.py b/nipype/interfaces/ants/tests/test_auto_CompositeTransformUtil.py index 214ac0d4b5..9bedb990ec 100644 --- a/nipype/interfaces/ants/tests/test_auto_CompositeTransformUtil.py +++ b/nipype/interfaces/ants/tests/test_auto_CompositeTransformUtil.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import CompositeTransformUtil diff --git a/nipype/interfaces/ants/tests/test_auto_ConvertScalarImageToRGB.py b/nipype/interfaces/ants/tests/test_auto_ConvertScalarImageToRGB.py index 5f44196a51..b3944ed735 100644 --- a/nipype/interfaces/ants/tests/test_auto_ConvertScalarImageToRGB.py +++ b/nipype/interfaces/ants/tests/test_auto_ConvertScalarImageToRGB.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..visualization import ConvertScalarImageToRGB diff --git a/nipype/interfaces/ants/tests/test_auto_CorticalThickness.py b/nipype/interfaces/ants/tests/test_auto_CorticalThickness.py index 005e3c949c..d3cf218934 100644 --- a/nipype/interfaces/ants/tests/test_auto_CorticalThickness.py +++ b/nipype/interfaces/ants/tests/test_auto_CorticalThickness.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..segmentation import CorticalThickness diff --git a/nipype/interfaces/ants/tests/test_auto_CreateJacobianDeterminantImage.py b/nipype/interfaces/ants/tests/test_auto_CreateJacobianDeterminantImage.py index 0734b73c29..d5ac0c1d06 100644 --- a/nipype/interfaces/ants/tests/test_auto_CreateJacobianDeterminantImage.py +++ b/nipype/interfaces/ants/tests/test_auto_CreateJacobianDeterminantImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import CreateJacobianDeterminantImage diff --git a/nipype/interfaces/ants/tests/test_auto_CreateTiledMosaic.py b/nipype/interfaces/ants/tests/test_auto_CreateTiledMosaic.py index 22e160cb10..e6a4142c90 100644 --- a/nipype/interfaces/ants/tests/test_auto_CreateTiledMosaic.py +++ b/nipype/interfaces/ants/tests/test_auto_CreateTiledMosaic.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..visualization import CreateTiledMosaic diff --git a/nipype/interfaces/ants/tests/test_auto_DenoiseImage.py b/nipype/interfaces/ants/tests/test_auto_DenoiseImage.py index 6b8bebbbe1..0c65abc907 100644 --- a/nipype/interfaces/ants/tests/test_auto_DenoiseImage.py +++ b/nipype/interfaces/ants/tests/test_auto_DenoiseImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..segmentation import DenoiseImage diff --git a/nipype/interfaces/ants/tests/test_auto_GenWarpFields.py b/nipype/interfaces/ants/tests/test_auto_GenWarpFields.py deleted file mode 100644 index 69ed18ff19..0000000000 --- a/nipype/interfaces/ants/tests/test_auto_GenWarpFields.py +++ /dev/null @@ -1,69 +0,0 @@ -# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals -from ..legacy import GenWarpFields - - -def test_GenWarpFields_inputs(): - input_map = dict( - args=dict(argstr='%s', ), - bias_field_correction=dict(argstr='-n 1', ), - dimension=dict( - argstr='-d %d', - position=1, - usedefault=True, - ), - environ=dict( - nohash=True, - usedefault=True, - ), - force_proceed=dict(argstr='-f 1', ), - input_image=dict( - argstr='-i %s', - copyfile=False, - extensions=None, - mandatory=True, - ), - inverse_warp_template_labels=dict(argstr='-l', ), - max_iterations=dict( - argstr='-m %s', - sep='x', - ), - num_threads=dict( - nohash=True, - usedefault=True, - ), - out_prefix=dict( - argstr='-o %s', - usedefault=True, - ), - quality_check=dict(argstr='-q 1', ), - reference_image=dict( - argstr='-r %s', - copyfile=True, - extensions=None, - mandatory=True, - ), - similarity_metric=dict(argstr='-s %s', ), - transformation_model=dict( - argstr='-t %s', - usedefault=True, - ), - ) - inputs = GenWarpFields.input_spec() - - for key, metadata in list(input_map.items()): - for metakey, value in list(metadata.items()): - assert getattr(inputs.traits()[key], metakey) == value -def test_GenWarpFields_outputs(): - output_map = dict( - affine_transformation=dict(extensions=None, ), - input_file=dict(extensions=None, ), - inverse_warp_field=dict(extensions=None, ), - output_file=dict(extensions=None, ), - warp_field=dict(extensions=None, ), - ) - outputs = GenWarpFields.output_spec() - - for key, metadata in list(output_map.items()): - for metakey, value in list(metadata.items()): - assert getattr(outputs.traits()[key], metakey) == value diff --git a/nipype/interfaces/ants/tests/test_auto_JointFusion.py b/nipype/interfaces/ants/tests/test_auto_JointFusion.py index 50bb8b1c84..b6639938bb 100644 --- a/nipype/interfaces/ants/tests/test_auto_JointFusion.py +++ b/nipype/interfaces/ants/tests/test_auto_JointFusion.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..segmentation import JointFusion diff --git a/nipype/interfaces/ants/tests/test_auto_KellyKapowski.py b/nipype/interfaces/ants/tests/test_auto_KellyKapowski.py index aecffa75b7..881071500e 100644 --- a/nipype/interfaces/ants/tests/test_auto_KellyKapowski.py +++ b/nipype/interfaces/ants/tests/test_auto_KellyKapowski.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..segmentation import KellyKapowski diff --git a/nipype/interfaces/ants/tests/test_auto_LabelGeometry.py b/nipype/interfaces/ants/tests/test_auto_LabelGeometry.py index cc44d0f059..73e789f885 100644 --- a/nipype/interfaces/ants/tests/test_auto_LabelGeometry.py +++ b/nipype/interfaces/ants/tests/test_auto_LabelGeometry.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import LabelGeometry diff --git a/nipype/interfaces/ants/tests/test_auto_LaplacianThickness.py b/nipype/interfaces/ants/tests/test_auto_LaplacianThickness.py index d10e154ce6..89fa00044c 100644 --- a/nipype/interfaces/ants/tests/test_auto_LaplacianThickness.py +++ b/nipype/interfaces/ants/tests/test_auto_LaplacianThickness.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..segmentation import LaplacianThickness diff --git a/nipype/interfaces/ants/tests/test_auto_MeasureImageSimilarity.py b/nipype/interfaces/ants/tests/test_auto_MeasureImageSimilarity.py index 88eeaf2360..bc90711b69 100644 --- a/nipype/interfaces/ants/tests/test_auto_MeasureImageSimilarity.py +++ b/nipype/interfaces/ants/tests/test_auto_MeasureImageSimilarity.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import MeasureImageSimilarity diff --git a/nipype/interfaces/ants/tests/test_auto_MultiplyImages.py b/nipype/interfaces/ants/tests/test_auto_MultiplyImages.py index 72166bd17d..5aad6c1722 100644 --- a/nipype/interfaces/ants/tests/test_auto_MultiplyImages.py +++ b/nipype/interfaces/ants/tests/test_auto_MultiplyImages.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MultiplyImages diff --git a/nipype/interfaces/ants/tests/test_auto_N4BiasFieldCorrection.py b/nipype/interfaces/ants/tests/test_auto_N4BiasFieldCorrection.py index 833e32315b..c7391afb71 100644 --- a/nipype/interfaces/ants/tests/test_auto_N4BiasFieldCorrection.py +++ b/nipype/interfaces/ants/tests/test_auto_N4BiasFieldCorrection.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..segmentation import N4BiasFieldCorrection diff --git a/nipype/interfaces/ants/tests/test_auto_Registration.py b/nipype/interfaces/ants/tests/test_auto_Registration.py index 1b49f44678..1231b1d1a0 100644 --- a/nipype/interfaces/ants/tests/test_auto_Registration.py +++ b/nipype/interfaces/ants/tests/test_auto_Registration.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import Registration diff --git a/nipype/interfaces/ants/tests/test_auto_RegistrationSynQuick.py b/nipype/interfaces/ants/tests/test_auto_RegistrationSynQuick.py index d2b527556b..5448df5ed5 100644 --- a/nipype/interfaces/ants/tests/test_auto_RegistrationSynQuick.py +++ b/nipype/interfaces/ants/tests/test_auto_RegistrationSynQuick.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import RegistrationSynQuick diff --git a/nipype/interfaces/ants/tests/test_auto_WarpImageMultiTransform.py b/nipype/interfaces/ants/tests/test_auto_WarpImageMultiTransform.py index 8a62b58b42..e8385c9c6a 100644 --- a/nipype/interfaces/ants/tests/test_auto_WarpImageMultiTransform.py +++ b/nipype/interfaces/ants/tests/test_auto_WarpImageMultiTransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..resampling import WarpImageMultiTransform diff --git a/nipype/interfaces/ants/tests/test_auto_WarpTimeSeriesImageMultiTransform.py b/nipype/interfaces/ants/tests/test_auto_WarpTimeSeriesImageMultiTransform.py index b9b17585f6..0ab8a379de 100644 --- a/nipype/interfaces/ants/tests/test_auto_WarpTimeSeriesImageMultiTransform.py +++ b/nipype/interfaces/ants/tests/test_auto_WarpTimeSeriesImageMultiTransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..resampling import WarpTimeSeriesImageMultiTransform diff --git a/nipype/interfaces/ants/tests/test_auto_antsIntroduction.py b/nipype/interfaces/ants/tests/test_auto_antsIntroduction.py deleted file mode 100644 index d2cdc074a4..0000000000 --- a/nipype/interfaces/ants/tests/test_auto_antsIntroduction.py +++ /dev/null @@ -1,69 +0,0 @@ -# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals -from ..legacy import antsIntroduction - - -def test_antsIntroduction_inputs(): - input_map = dict( - args=dict(argstr='%s', ), - bias_field_correction=dict(argstr='-n 1', ), - dimension=dict( - argstr='-d %d', - position=1, - usedefault=True, - ), - environ=dict( - nohash=True, - usedefault=True, - ), - force_proceed=dict(argstr='-f 1', ), - input_image=dict( - argstr='-i %s', - copyfile=False, - extensions=None, - mandatory=True, - ), - inverse_warp_template_labels=dict(argstr='-l', ), - max_iterations=dict( - argstr='-m %s', - sep='x', - ), - num_threads=dict( - nohash=True, - usedefault=True, - ), - out_prefix=dict( - argstr='-o %s', - usedefault=True, - ), - quality_check=dict(argstr='-q 1', ), - reference_image=dict( - argstr='-r %s', - copyfile=True, - extensions=None, - mandatory=True, - ), - similarity_metric=dict(argstr='-s %s', ), - transformation_model=dict( - argstr='-t %s', - usedefault=True, - ), - ) - inputs = antsIntroduction.input_spec() - - for key, metadata in list(input_map.items()): - for metakey, value in list(metadata.items()): - assert getattr(inputs.traits()[key], metakey) == value -def test_antsIntroduction_outputs(): - output_map = dict( - affine_transformation=dict(extensions=None, ), - input_file=dict(extensions=None, ), - inverse_warp_field=dict(extensions=None, ), - output_file=dict(extensions=None, ), - warp_field=dict(extensions=None, ), - ) - outputs = antsIntroduction.output_spec() - - for key, metadata in list(output_map.items()): - for metakey, value in list(metadata.items()): - assert getattr(outputs.traits()[key], metakey) == value diff --git a/nipype/interfaces/ants/tests/test_auto_buildtemplateparallel.py b/nipype/interfaces/ants/tests/test_auto_buildtemplateparallel.py deleted file mode 100644 index a1d77b11ac..0000000000 --- a/nipype/interfaces/ants/tests/test_auto_buildtemplateparallel.py +++ /dev/null @@ -1,72 +0,0 @@ -# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals -from ..legacy import buildtemplateparallel - - -def test_buildtemplateparallel_inputs(): - input_map = dict( - args=dict(argstr='%s', ), - bias_field_correction=dict(argstr='-n 1', ), - dimension=dict( - argstr='-d %d', - position=1, - usedefault=True, - ), - environ=dict( - nohash=True, - usedefault=True, - ), - gradient_step_size=dict(argstr='-g %f', ), - in_files=dict( - argstr='%s', - mandatory=True, - position=-1, - ), - iteration_limit=dict( - argstr='-i %d', - usedefault=True, - ), - max_iterations=dict( - argstr='-m %s', - sep='x', - ), - num_cores=dict( - argstr='-j %d', - requires=['parallelization'], - ), - num_threads=dict( - nohash=True, - usedefault=True, - ), - out_prefix=dict( - argstr='-o %s', - usedefault=True, - ), - parallelization=dict( - argstr='-c %d', - usedefault=True, - ), - rigid_body_registration=dict(argstr='-r 1', ), - similarity_metric=dict(argstr='-s %s', ), - transformation_model=dict( - argstr='-t %s', - usedefault=True, - ), - use_first_as_target=dict(), - ) - inputs = buildtemplateparallel.input_spec() - - for key, metadata in list(input_map.items()): - for metakey, value in list(metadata.items()): - assert getattr(inputs.traits()[key], metakey) == value -def test_buildtemplateparallel_outputs(): - output_map = dict( - final_template_file=dict(extensions=None, ), - subject_outfiles=dict(), - template_files=dict(), - ) - outputs = buildtemplateparallel.output_spec() - - for key, metadata in list(output_map.items()): - for metakey, value in list(metadata.items()): - assert getattr(outputs.traits()[key], metakey) == value diff --git a/nipype/interfaces/ants/tests/test_extra_Registration.py b/nipype/interfaces/ants/tests/test_extra_Registration.py index 745b825c65..1f38f3c61f 100644 --- a/nipype/interfaces/ants/tests/test_extra_Registration.py +++ b/nipype/interfaces/ants/tests/test_extra_Registration.py @@ -1,6 +1,5 @@ # 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 unicode_literals from nipype.interfaces.ants import registration import os import pytest diff --git a/nipype/interfaces/ants/tests/test_spec_JointFusion.py b/nipype/interfaces/ants/tests/test_spec_JointFusion.py index b2ca69926a..a1dc03cc40 100644 --- a/nipype/interfaces/ants/tests/test_spec_JointFusion.py +++ b/nipype/interfaces/ants/tests/test_spec_JointFusion.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import division -from builtins import range from nipype.testing import example_data from nipype.interfaces.base import InputMultiPath from traits.trait_errors import TraitError diff --git a/nipype/interfaces/ants/utils.py b/nipype/interfaces/ants/utils.py index 5d284b89c0..0725f45edc 100644 --- a/nipype/interfaces/ants/utils.py +++ b/nipype/interfaces/ants/utils.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- """ANTS Apply Transforms interface """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os diff --git a/nipype/interfaces/ants/visualization.py b/nipype/interfaces/ants/visualization.py index 21186931ce..b5ab661889 100644 --- a/nipype/interfaces/ants/visualization.py +++ b/nipype/interfaces/ants/visualization.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- """The ants visualisation module provides basic functions based on ITK. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os diff --git a/nipype/interfaces/base/core.py b/nipype/interfaces/base/core.py index 85cad50045..126fd51a8a 100644 --- a/nipype/interfaces/base/core.py +++ b/nipype/interfaces/base/core.py @@ -12,11 +12,6 @@ interfaces are found in the ``specs`` module. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) - -from builtins import object, open, str, bytes - from copy import deepcopy from datetime import datetime as dt import os @@ -26,14 +21,12 @@ import sys import simplejson as json from dateutil.parser import parse as parseutc -from future import standard_library from traits.trait_errors import TraitError from ... import config, logging, LooseVersion from ...utils.provenance import write_provenance from ...utils.misc import str2bool, rgetcwd -from ...utils.filemanip import (FileNotFoundError, split_filename, - which, get_dependencies) +from ...utils.filemanip import (split_filename, which, get_dependencies) from ...utils.subprocess import run_command from ...external.due import due @@ -45,12 +38,8 @@ from .support import (Bunch, InterfaceResult, NipypeInterfaceError, format_help) -standard_library.install_aliases() - iflogger = logging.getLogger('nipype.interface') -PY35 = sys.version_info >= (3, 5) -PY3 = sys.version_info[0] > 2 VALID_TERMINAL_OUTPUT = [ 'stream', 'allatonce', 'file', 'file_split', 'file_stdout', 'file_stderr', 'none' @@ -519,7 +508,7 @@ def save_inputs_to_json(self, json_file): """ inputs = self.inputs.get_traitsfree() iflogger.debug('saving inputs %s', inputs) - with open(json_file, 'w' if PY3 else 'wb') as fhandle: + with open(json_file, 'w') as fhandle: json.dump(inputs, fhandle, indent=4, ensure_ascii=False) def _pre_run_hook(self, runtime): diff --git a/nipype/interfaces/base/specs.py b/nipype/interfaces/base/specs.py index c99620e9d8..4c9b36cc26 100644 --- a/nipype/interfaces/base/specs.py +++ b/nipype/interfaces/base/specs.py @@ -9,20 +9,15 @@ Define the API for the I/O of interfaces """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) - import os from inspect import isclass from copy import deepcopy from warnings import warn -from builtins import str, bytes from packaging.version import Version from traits.trait_errors import TraitError from traits.trait_handlers import TraitDictObject, TraitListObject -from ...utils.filemanip import ( - md5, hash_infile, hash_timestamp, to_str, USING_PATHLIB2) +from ...utils.filemanip import md5, hash_infile, hash_timestamp from .traits_extension import ( traits, File, @@ -259,7 +254,7 @@ def get_hashval(self, hash_method=None): True, hash_method=hash_method, hash_files=hash_files))) - return list_withhash, md5(to_str(list_nofilename).encode()).hexdigest() + return list_withhash, md5(str(list_nofilename).encode()).hexdigest() def _get_sorteddict(self, objekt, @@ -344,39 +339,6 @@ def __getstate__(self): return state -def _deepcopypatch(self, memo): - """ - Replace the ``__deepcopy__`` member with a traits-friendly implementation. - - A bug in ``__deepcopy__`` for ``HasTraits`` results in weird cloning behaviors. - Occurs for all specs in Python<3 and only for DynamicTraitedSpec in Python>2. - - """ - id_self = id(self) - if id_self in memo: - return memo[id_self] - dup_dict = deepcopy(self.trait_get(), memo) - # access all keys - for key in self.copyable_trait_names(): - if key in self.__dict__.keys(): - _ = getattr(self, key) - # clone once - dup = self.clone_traits(memo=memo) - for key in self.copyable_trait_names(): - try: - _ = getattr(dup, key) - except: - pass - # clone twice - dup = self.clone_traits(memo=memo) - dup.trait_set(**dup_dict) - return dup - - -if USING_PATHLIB2: - BaseTraitedSpec.__deepcopy__ = _deepcopypatch - - class TraitedSpec(BaseTraitedSpec): """ Create a subclass with strict traits. @@ -395,10 +357,31 @@ class DynamicTraitedSpec(BaseTraitedSpec): This class is a workaround for add_traits and clone_traits not functioning well together. """ + def __deepcopy__(self, memo): + """ + Replace the ``__deepcopy__`` member with a traits-friendly implementation. - -if not USING_PATHLIB2: - DynamicTraitedSpec.__deepcopy__ = _deepcopypatch + A bug in ``__deepcopy__`` for ``HasTraits`` results in weird cloning behaviors. + """ + id_self = id(self) + if id_self in memo: + return memo[id_self] + dup_dict = deepcopy(self.trait_get(), memo) + # access all keys + for key in self.copyable_trait_names(): + if key in self.__dict__.keys(): + _ = getattr(self, key) + # clone once + dup = self.clone_traits(memo=memo) + for key in self.copyable_trait_names(): + try: + _ = getattr(dup, key) + except: + pass + # clone twice + dup = self.clone_traits(memo=memo) + dup.trait_set(**dup_dict) + return dup class CommandLineInputSpec(BaseInterfaceInputSpec): diff --git a/nipype/interfaces/base/support.py b/nipype/interfaces/base/support.py index 0fd1d27674..18d2471c48 100644 --- a/nipype/interfaces/base/support.py +++ b/nipype/interfaces/base/support.py @@ -7,10 +7,6 @@ ...................................................... """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import object, str - import os from copy import deepcopy from textwrap import wrap @@ -18,7 +14,7 @@ from ... import logging from ...utils.misc import is_container -from ...utils.filemanip import md5, to_str, hash_infile +from ...utils.filemanip import md5, hash_infile iflogger = logging.getLogger('nipype.interface') HELP_LINEWIDTH = 70 @@ -165,7 +161,7 @@ def _get_bunch_hash(self): # Sort the items of the dictionary, before hashing the string # representation so we get a predictable order of the # dictionary. - sorted_dict = to_str(sorted(dict_nofilename.items())) + sorted_dict = str(sorted(dict_nofilename.items())) return dict_withhash, md5(sorted_dict.encode()).hexdigest() def _repr_pretty_(self, p, cycle): diff --git a/nipype/interfaces/base/tests/test_auto_BaseInterface.py b/nipype/interfaces/base/tests/test_auto_BaseInterface.py index eb0272d495..4ee8ea9359 100644 --- a/nipype/interfaces/base/tests/test_auto_BaseInterface.py +++ b/nipype/interfaces/base/tests/test_auto_BaseInterface.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..core import BaseInterface diff --git a/nipype/interfaces/base/tests/test_auto_CommandLine.py b/nipype/interfaces/base/tests/test_auto_CommandLine.py index fb16422864..22d7406921 100644 --- a/nipype/interfaces/base/tests/test_auto_CommandLine.py +++ b/nipype/interfaces/base/tests/test_auto_CommandLine.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..core import CommandLine diff --git a/nipype/interfaces/base/tests/test_auto_LibraryBaseInterface.py b/nipype/interfaces/base/tests/test_auto_LibraryBaseInterface.py index 19beef071f..9893a781a9 100644 --- a/nipype/interfaces/base/tests/test_auto_LibraryBaseInterface.py +++ b/nipype/interfaces/base/tests/test_auto_LibraryBaseInterface.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..core import LibraryBaseInterface diff --git a/nipype/interfaces/base/tests/test_auto_MpiCommandLine.py b/nipype/interfaces/base/tests/test_auto_MpiCommandLine.py index 2d66f2f623..4084a19945 100644 --- a/nipype/interfaces/base/tests/test_auto_MpiCommandLine.py +++ b/nipype/interfaces/base/tests/test_auto_MpiCommandLine.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..core import MpiCommandLine diff --git a/nipype/interfaces/base/tests/test_auto_SEMLikeCommandLine.py b/nipype/interfaces/base/tests/test_auto_SEMLikeCommandLine.py index aceabfe2a2..18e788f3a4 100644 --- a/nipype/interfaces/base/tests/test_auto_SEMLikeCommandLine.py +++ b/nipype/interfaces/base/tests/test_auto_SEMLikeCommandLine.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..core import SEMLikeCommandLine diff --git a/nipype/interfaces/base/tests/test_auto_SimpleInterface.py b/nipype/interfaces/base/tests/test_auto_SimpleInterface.py index 2a4454dd9f..ac62059628 100644 --- a/nipype/interfaces/base/tests/test_auto_SimpleInterface.py +++ b/nipype/interfaces/base/tests/test_auto_SimpleInterface.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..core import SimpleInterface diff --git a/nipype/interfaces/base/tests/test_auto_StdOutCommandLine.py b/nipype/interfaces/base/tests/test_auto_StdOutCommandLine.py index 95afcd3216..de6ef5450a 100644 --- a/nipype/interfaces/base/tests/test_auto_StdOutCommandLine.py +++ b/nipype/interfaces/base/tests/test_auto_StdOutCommandLine.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..core import StdOutCommandLine diff --git a/nipype/interfaces/base/tests/test_core.py b/nipype/interfaces/base/tests/test_core.py index 265edc444f..a265d8f8a9 100644 --- a/nipype/interfaces/base/tests/test_core.py +++ b/nipype/interfaces/base/tests/test_core.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, unicode_literals -from future import standard_library -from builtins import open import os import simplejson as json @@ -14,8 +11,6 @@ from ... import base as nib from ..support import _inputs_help -standard_library.install_aliases() - def check_dict(ref_dict, tst_dict): """Compare dictionaries of inputs and and those loaded from json files""" diff --git a/nipype/interfaces/base/tests/test_resource_monitor.py b/nipype/interfaces/base/tests/test_resource_monitor.py index d40ecbebde..a6c79b091b 100644 --- a/nipype/interfaces/base/tests/test_resource_monitor.py +++ b/nipype/interfaces/base/tests/test_resource_monitor.py @@ -6,8 +6,6 @@ Module to unit test the resource_monitor in nipype """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os import pytest diff --git a/nipype/interfaces/base/tests/test_specs.py b/nipype/interfaces/base/tests/test_specs.py index b27daea6a8..f1721fa226 100644 --- a/nipype/interfaces/base/tests/test_specs.py +++ b/nipype/interfaces/base/tests/test_specs.py @@ -1,10 +1,8 @@ # -*- 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, unicode_literals import os import warnings -from future import standard_library import pytest @@ -16,8 +14,6 @@ from ....pipeline import Node from ..specs import get_filecopy_info -standard_library.install_aliases() - @pytest.fixture(scope="module") def setup_file(request, tmpdir_factory): diff --git a/nipype/interfaces/base/tests/test_support.py b/nipype/interfaces/base/tests/test_support.py index e6db69a458..fbd6dcc209 100644 --- a/nipype/interfaces/base/tests/test_support.py +++ b/nipype/interfaces/base/tests/test_support.py @@ -1,18 +1,14 @@ # -*- 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, unicode_literals import os import pytest -from builtins import open -from future import standard_library + from pkg_resources import resource_filename as pkgrf from ....utils.filemanip import md5 from ... import base as nib -standard_library.install_aliases() - @pytest.mark.parametrize("args", [{}, {'a': 1, 'b': [2, 3]}]) def test_bunch(args): diff --git a/nipype/interfaces/base/tests/test_traits_extension.py b/nipype/interfaces/base/tests/test_traits_extension.py index 8138d691f3..ac9c36adf7 100644 --- a/nipype/interfaces/base/tests/test_traits_extension.py +++ b/nipype/interfaces/base/tests/test_traits_extension.py @@ -1,8 +1,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: """Check the resolving/rebasing feature of ``BasePath``s.""" -from __future__ import print_function, unicode_literals - from ... import base as nib from ..traits_extension import rebase_path_traits, resolve_path_traits, Path diff --git a/nipype/interfaces/base/traits_extension.py b/nipype/interfaces/base/traits_extension.py index 17a637546d..2e176e8bd4 100644 --- a/nipype/interfaces/base/traits_extension.py +++ b/nipype/interfaces/base/traits_extension.py @@ -19,10 +19,6 @@ (usually by Robert Kern). """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) - -from builtins import str, bytes from collections import Sequence # perform all external trait imports here @@ -32,18 +28,12 @@ from traits.trait_base import _Undefined from traits.api import Unicode -from future import standard_library -from ...utils.filemanip import Path, USING_PATHLIB2, path_resolve - -if USING_PATHLIB2: - from future.types.newstr import newstr - +from pathlib import Path +from ...utils.filemanip import path_resolve if traits_version < '3.7.0': raise ImportError('Traits version 3.7.0 or higher must be installed') -standard_library.install_aliases() - IMG_FORMATS = { 'afni': ('.HEAD', '.BRIK'), 'cifti2': ('.nii', '.nii.gz'), @@ -130,8 +120,6 @@ def __init__(self, value=Undefined, exists=False, resolve=False, **metadata): def validate(self, objekt, name, value, return_pathlike=False): """Validate a value change.""" try: - if USING_PATHLIB2 and isinstance(value, newstr): - value = '%s' % value # pathlib2 doesn't like newstr value = Path(value) # Use pathlib's validation except Exception: self.error(objekt, name, str(value)) diff --git a/nipype/interfaces/brainsuite/brainsuite.py b/nipype/interfaces/brainsuite/brainsuite.py index aa75d2bf81..919e9aba1a 100644 --- a/nipype/interfaces/brainsuite/brainsuite.py +++ b/nipype/interfaces/brainsuite/brainsuite.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os import re as regex diff --git a/nipype/interfaces/brainsuite/tests/test_auto_BDP.py b/nipype/interfaces/brainsuite/tests/test_auto_BDP.py index a948b7c698..ae25cb0598 100644 --- a/nipype/interfaces/brainsuite/tests/test_auto_BDP.py +++ b/nipype/interfaces/brainsuite/tests/test_auto_BDP.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsuite import BDP diff --git a/nipype/interfaces/brainsuite/tests/test_auto_Bfc.py b/nipype/interfaces/brainsuite/tests/test_auto_Bfc.py index a29e1b75cf..3f41f15518 100644 --- a/nipype/interfaces/brainsuite/tests/test_auto_Bfc.py +++ b/nipype/interfaces/brainsuite/tests/test_auto_Bfc.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsuite import Bfc diff --git a/nipype/interfaces/brainsuite/tests/test_auto_Bse.py b/nipype/interfaces/brainsuite/tests/test_auto_Bse.py index 46850631bd..3476926f0e 100644 --- a/nipype/interfaces/brainsuite/tests/test_auto_Bse.py +++ b/nipype/interfaces/brainsuite/tests/test_auto_Bse.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsuite import Bse diff --git a/nipype/interfaces/brainsuite/tests/test_auto_Cerebro.py b/nipype/interfaces/brainsuite/tests/test_auto_Cerebro.py index ea0c58c981..91b610bbf2 100644 --- a/nipype/interfaces/brainsuite/tests/test_auto_Cerebro.py +++ b/nipype/interfaces/brainsuite/tests/test_auto_Cerebro.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsuite import Cerebro diff --git a/nipype/interfaces/brainsuite/tests/test_auto_Cortex.py b/nipype/interfaces/brainsuite/tests/test_auto_Cortex.py index d8099b932c..607d98eb14 100644 --- a/nipype/interfaces/brainsuite/tests/test_auto_Cortex.py +++ b/nipype/interfaces/brainsuite/tests/test_auto_Cortex.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsuite import Cortex diff --git a/nipype/interfaces/brainsuite/tests/test_auto_Dewisp.py b/nipype/interfaces/brainsuite/tests/test_auto_Dewisp.py index 276185df1e..d6eb0c6414 100644 --- a/nipype/interfaces/brainsuite/tests/test_auto_Dewisp.py +++ b/nipype/interfaces/brainsuite/tests/test_auto_Dewisp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsuite import Dewisp diff --git a/nipype/interfaces/brainsuite/tests/test_auto_Dfs.py b/nipype/interfaces/brainsuite/tests/test_auto_Dfs.py index efb216f30d..f79d309262 100644 --- a/nipype/interfaces/brainsuite/tests/test_auto_Dfs.py +++ b/nipype/interfaces/brainsuite/tests/test_auto_Dfs.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsuite import Dfs diff --git a/nipype/interfaces/brainsuite/tests/test_auto_Hemisplit.py b/nipype/interfaces/brainsuite/tests/test_auto_Hemisplit.py index 567d3bcdc4..cfc74eb69a 100644 --- a/nipype/interfaces/brainsuite/tests/test_auto_Hemisplit.py +++ b/nipype/interfaces/brainsuite/tests/test_auto_Hemisplit.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsuite import Hemisplit diff --git a/nipype/interfaces/brainsuite/tests/test_auto_Pialmesh.py b/nipype/interfaces/brainsuite/tests/test_auto_Pialmesh.py index 125a0504ed..561f6ef1d8 100644 --- a/nipype/interfaces/brainsuite/tests/test_auto_Pialmesh.py +++ b/nipype/interfaces/brainsuite/tests/test_auto_Pialmesh.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsuite import Pialmesh diff --git a/nipype/interfaces/brainsuite/tests/test_auto_Pvc.py b/nipype/interfaces/brainsuite/tests/test_auto_Pvc.py index 3f79a0cdf6..5b93215b70 100644 --- a/nipype/interfaces/brainsuite/tests/test_auto_Pvc.py +++ b/nipype/interfaces/brainsuite/tests/test_auto_Pvc.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsuite import Pvc diff --git a/nipype/interfaces/brainsuite/tests/test_auto_SVReg.py b/nipype/interfaces/brainsuite/tests/test_auto_SVReg.py index 7449e1488a..3d861a0677 100644 --- a/nipype/interfaces/brainsuite/tests/test_auto_SVReg.py +++ b/nipype/interfaces/brainsuite/tests/test_auto_SVReg.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsuite import SVReg diff --git a/nipype/interfaces/brainsuite/tests/test_auto_Scrubmask.py b/nipype/interfaces/brainsuite/tests/test_auto_Scrubmask.py index 17ec62fe83..c04b16d5d2 100644 --- a/nipype/interfaces/brainsuite/tests/test_auto_Scrubmask.py +++ b/nipype/interfaces/brainsuite/tests/test_auto_Scrubmask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsuite import Scrubmask diff --git a/nipype/interfaces/brainsuite/tests/test_auto_Skullfinder.py b/nipype/interfaces/brainsuite/tests/test_auto_Skullfinder.py index ed921d09b9..11707befa3 100644 --- a/nipype/interfaces/brainsuite/tests/test_auto_Skullfinder.py +++ b/nipype/interfaces/brainsuite/tests/test_auto_Skullfinder.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsuite import Skullfinder diff --git a/nipype/interfaces/brainsuite/tests/test_auto_Tca.py b/nipype/interfaces/brainsuite/tests/test_auto_Tca.py index 94f7868f94..b7767a1b01 100644 --- a/nipype/interfaces/brainsuite/tests/test_auto_Tca.py +++ b/nipype/interfaces/brainsuite/tests/test_auto_Tca.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsuite import Tca diff --git a/nipype/interfaces/brainsuite/tests/test_auto_ThicknessPVC.py b/nipype/interfaces/brainsuite/tests/test_auto_ThicknessPVC.py index d614ce335a..cf2174690e 100644 --- a/nipype/interfaces/brainsuite/tests/test_auto_ThicknessPVC.py +++ b/nipype/interfaces/brainsuite/tests/test_auto_ThicknessPVC.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsuite import ThicknessPVC diff --git a/nipype/interfaces/bru2nii.py b/nipype/interfaces/bru2nii.py index 9c6a5c6acf..1b4574f00c 100644 --- a/nipype/interfaces/bru2nii.py +++ b/nipype/interfaces/bru2nii.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- """The bru2nii module provides basic functions for dicom conversion """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os from .base import (CommandLine, CommandLineInputSpec, traits, TraitedSpec, diff --git a/nipype/interfaces/c3.py b/nipype/interfaces/c3.py index 115804cc3f..db81fce55f 100644 --- a/nipype/interfaces/c3.py +++ b/nipype/interfaces/c3.py @@ -2,8 +2,6 @@ """The ants module provides basic functions for interfacing with ants functions. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os from glob import glob diff --git a/nipype/interfaces/camino/calib.py b/nipype/interfaces/camino/calib.py index 1921f62651..24eb993bf6 100644 --- a/nipype/interfaces/camino/calib.py +++ b/nipype/interfaces/camino/calib.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os diff --git a/nipype/interfaces/camino/connectivity.py b/nipype/interfaces/camino/connectivity.py index 97e400e0f5..78172db9cc 100644 --- a/nipype/interfaces/camino/connectivity.py +++ b/nipype/interfaces/camino/connectivity.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os from ...utils.filemanip import split_filename diff --git a/nipype/interfaces/camino/convert.py b/nipype/interfaces/camino/convert.py index 25f618610b..2ac96befaa 100644 --- a/nipype/interfaces/camino/convert.py +++ b/nipype/interfaces/camino/convert.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os import glob diff --git a/nipype/interfaces/camino/dti.py b/nipype/interfaces/camino/dti.py index 0cabe5fe7e..703b98f9fb 100644 --- a/nipype/interfaces/camino/dti.py +++ b/nipype/interfaces/camino/dti.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os diff --git a/nipype/interfaces/camino/odf.py b/nipype/interfaces/camino/odf.py index 6fea6fdcfd..163c41fd87 100644 --- a/nipype/interfaces/camino/odf.py +++ b/nipype/interfaces/camino/odf.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os diff --git a/nipype/interfaces/camino/tests/test_auto_AnalyzeHeader.py b/nipype/interfaces/camino/tests/test_auto_AnalyzeHeader.py index c40082d836..6341c5fb46 100644 --- a/nipype/interfaces/camino/tests/test_auto_AnalyzeHeader.py +++ b/nipype/interfaces/camino/tests/test_auto_AnalyzeHeader.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..convert import AnalyzeHeader diff --git a/nipype/interfaces/camino/tests/test_auto_ComputeEigensystem.py b/nipype/interfaces/camino/tests/test_auto_ComputeEigensystem.py index edf38864fa..63c652319c 100644 --- a/nipype/interfaces/camino/tests/test_auto_ComputeEigensystem.py +++ b/nipype/interfaces/camino/tests/test_auto_ComputeEigensystem.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import ComputeEigensystem diff --git a/nipype/interfaces/camino/tests/test_auto_ComputeFractionalAnisotropy.py b/nipype/interfaces/camino/tests/test_auto_ComputeFractionalAnisotropy.py index 75604df01b..6475557c40 100644 --- a/nipype/interfaces/camino/tests/test_auto_ComputeFractionalAnisotropy.py +++ b/nipype/interfaces/camino/tests/test_auto_ComputeFractionalAnisotropy.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import ComputeFractionalAnisotropy diff --git a/nipype/interfaces/camino/tests/test_auto_ComputeMeanDiffusivity.py b/nipype/interfaces/camino/tests/test_auto_ComputeMeanDiffusivity.py index faff5234c3..a068d7de24 100644 --- a/nipype/interfaces/camino/tests/test_auto_ComputeMeanDiffusivity.py +++ b/nipype/interfaces/camino/tests/test_auto_ComputeMeanDiffusivity.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import ComputeMeanDiffusivity diff --git a/nipype/interfaces/camino/tests/test_auto_ComputeTensorTrace.py b/nipype/interfaces/camino/tests/test_auto_ComputeTensorTrace.py index 4d31fa884c..a05dbf331c 100644 --- a/nipype/interfaces/camino/tests/test_auto_ComputeTensorTrace.py +++ b/nipype/interfaces/camino/tests/test_auto_ComputeTensorTrace.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import ComputeTensorTrace diff --git a/nipype/interfaces/camino/tests/test_auto_Conmat.py b/nipype/interfaces/camino/tests/test_auto_Conmat.py index cbcebd61c7..52a5b668d7 100644 --- a/nipype/interfaces/camino/tests/test_auto_Conmat.py +++ b/nipype/interfaces/camino/tests/test_auto_Conmat.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..connectivity import Conmat diff --git a/nipype/interfaces/camino/tests/test_auto_DT2NIfTI.py b/nipype/interfaces/camino/tests/test_auto_DT2NIfTI.py index 244ef010bd..ab006820f8 100644 --- a/nipype/interfaces/camino/tests/test_auto_DT2NIfTI.py +++ b/nipype/interfaces/camino/tests/test_auto_DT2NIfTI.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..convert import DT2NIfTI diff --git a/nipype/interfaces/camino/tests/test_auto_DTIFit.py b/nipype/interfaces/camino/tests/test_auto_DTIFit.py index 0870a77752..9322028345 100644 --- a/nipype/interfaces/camino/tests/test_auto_DTIFit.py +++ b/nipype/interfaces/camino/tests/test_auto_DTIFit.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import DTIFit diff --git a/nipype/interfaces/camino/tests/test_auto_DTLUTGen.py b/nipype/interfaces/camino/tests/test_auto_DTLUTGen.py index 3242163c3a..9a564cf37b 100644 --- a/nipype/interfaces/camino/tests/test_auto_DTLUTGen.py +++ b/nipype/interfaces/camino/tests/test_auto_DTLUTGen.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import DTLUTGen diff --git a/nipype/interfaces/camino/tests/test_auto_DTMetric.py b/nipype/interfaces/camino/tests/test_auto_DTMetric.py index fd9b6333f4..2458921c8c 100644 --- a/nipype/interfaces/camino/tests/test_auto_DTMetric.py +++ b/nipype/interfaces/camino/tests/test_auto_DTMetric.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import DTMetric diff --git a/nipype/interfaces/camino/tests/test_auto_FSL2Scheme.py b/nipype/interfaces/camino/tests/test_auto_FSL2Scheme.py index 9b8a74be6a..cd06996609 100644 --- a/nipype/interfaces/camino/tests/test_auto_FSL2Scheme.py +++ b/nipype/interfaces/camino/tests/test_auto_FSL2Scheme.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..convert import FSL2Scheme diff --git a/nipype/interfaces/camino/tests/test_auto_Image2Voxel.py b/nipype/interfaces/camino/tests/test_auto_Image2Voxel.py index 2c013cf216..13a3107b6d 100644 --- a/nipype/interfaces/camino/tests/test_auto_Image2Voxel.py +++ b/nipype/interfaces/camino/tests/test_auto_Image2Voxel.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..convert import Image2Voxel diff --git a/nipype/interfaces/camino/tests/test_auto_ImageStats.py b/nipype/interfaces/camino/tests/test_auto_ImageStats.py index 7a16ea7732..77f23481fc 100644 --- a/nipype/interfaces/camino/tests/test_auto_ImageStats.py +++ b/nipype/interfaces/camino/tests/test_auto_ImageStats.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ImageStats diff --git a/nipype/interfaces/camino/tests/test_auto_LinRecon.py b/nipype/interfaces/camino/tests/test_auto_LinRecon.py index 147cfaab5e..8d7d991708 100644 --- a/nipype/interfaces/camino/tests/test_auto_LinRecon.py +++ b/nipype/interfaces/camino/tests/test_auto_LinRecon.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..odf import LinRecon diff --git a/nipype/interfaces/camino/tests/test_auto_MESD.py b/nipype/interfaces/camino/tests/test_auto_MESD.py index f7dfecfdb9..b41a8ed4ad 100644 --- a/nipype/interfaces/camino/tests/test_auto_MESD.py +++ b/nipype/interfaces/camino/tests/test_auto_MESD.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..odf import MESD diff --git a/nipype/interfaces/camino/tests/test_auto_ModelFit.py b/nipype/interfaces/camino/tests/test_auto_ModelFit.py index 6d49969eb6..ab2f6e1d73 100644 --- a/nipype/interfaces/camino/tests/test_auto_ModelFit.py +++ b/nipype/interfaces/camino/tests/test_auto_ModelFit.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import ModelFit diff --git a/nipype/interfaces/camino/tests/test_auto_NIfTIDT2Camino.py b/nipype/interfaces/camino/tests/test_auto_NIfTIDT2Camino.py index 65e0210268..9bdd2cc3ba 100644 --- a/nipype/interfaces/camino/tests/test_auto_NIfTIDT2Camino.py +++ b/nipype/interfaces/camino/tests/test_auto_NIfTIDT2Camino.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..convert import NIfTIDT2Camino diff --git a/nipype/interfaces/camino/tests/test_auto_PicoPDFs.py b/nipype/interfaces/camino/tests/test_auto_PicoPDFs.py index e5cdea5cae..7d118392dc 100644 --- a/nipype/interfaces/camino/tests/test_auto_PicoPDFs.py +++ b/nipype/interfaces/camino/tests/test_auto_PicoPDFs.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import PicoPDFs diff --git a/nipype/interfaces/camino/tests/test_auto_ProcStreamlines.py b/nipype/interfaces/camino/tests/test_auto_ProcStreamlines.py index 0386e0d54f..e4e9cb4d4f 100644 --- a/nipype/interfaces/camino/tests/test_auto_ProcStreamlines.py +++ b/nipype/interfaces/camino/tests/test_auto_ProcStreamlines.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..convert import ProcStreamlines diff --git a/nipype/interfaces/camino/tests/test_auto_QBallMX.py b/nipype/interfaces/camino/tests/test_auto_QBallMX.py index f452f26350..6e30e8e019 100644 --- a/nipype/interfaces/camino/tests/test_auto_QBallMX.py +++ b/nipype/interfaces/camino/tests/test_auto_QBallMX.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..odf import QBallMX diff --git a/nipype/interfaces/camino/tests/test_auto_SFLUTGen.py b/nipype/interfaces/camino/tests/test_auto_SFLUTGen.py index 220e116255..1b16f7b7d5 100644 --- a/nipype/interfaces/camino/tests/test_auto_SFLUTGen.py +++ b/nipype/interfaces/camino/tests/test_auto_SFLUTGen.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..calib import SFLUTGen diff --git a/nipype/interfaces/camino/tests/test_auto_SFPICOCalibData.py b/nipype/interfaces/camino/tests/test_auto_SFPICOCalibData.py index 1b71553676..9c89fef228 100644 --- a/nipype/interfaces/camino/tests/test_auto_SFPICOCalibData.py +++ b/nipype/interfaces/camino/tests/test_auto_SFPICOCalibData.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..calib import SFPICOCalibData diff --git a/nipype/interfaces/camino/tests/test_auto_SFPeaks.py b/nipype/interfaces/camino/tests/test_auto_SFPeaks.py index 49ac58aa06..ef382ff133 100644 --- a/nipype/interfaces/camino/tests/test_auto_SFPeaks.py +++ b/nipype/interfaces/camino/tests/test_auto_SFPeaks.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..odf import SFPeaks diff --git a/nipype/interfaces/camino/tests/test_auto_Shredder.py b/nipype/interfaces/camino/tests/test_auto_Shredder.py index 2d8ec43589..81a78f2feb 100644 --- a/nipype/interfaces/camino/tests/test_auto_Shredder.py +++ b/nipype/interfaces/camino/tests/test_auto_Shredder.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..convert import Shredder diff --git a/nipype/interfaces/camino/tests/test_auto_Track.py b/nipype/interfaces/camino/tests/test_auto_Track.py index fa03ce29d3..2b08ecf619 100644 --- a/nipype/interfaces/camino/tests/test_auto_Track.py +++ b/nipype/interfaces/camino/tests/test_auto_Track.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import Track diff --git a/nipype/interfaces/camino/tests/test_auto_TrackBallStick.py b/nipype/interfaces/camino/tests/test_auto_TrackBallStick.py index d6c7d332ac..d5514b301b 100644 --- a/nipype/interfaces/camino/tests/test_auto_TrackBallStick.py +++ b/nipype/interfaces/camino/tests/test_auto_TrackBallStick.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import TrackBallStick diff --git a/nipype/interfaces/camino/tests/test_auto_TrackBayesDirac.py b/nipype/interfaces/camino/tests/test_auto_TrackBayesDirac.py index fe28f030a3..d2b4b27dd3 100644 --- a/nipype/interfaces/camino/tests/test_auto_TrackBayesDirac.py +++ b/nipype/interfaces/camino/tests/test_auto_TrackBayesDirac.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import TrackBayesDirac diff --git a/nipype/interfaces/camino/tests/test_auto_TrackBedpostxDeter.py b/nipype/interfaces/camino/tests/test_auto_TrackBedpostxDeter.py index 483e752914..f137fda109 100644 --- a/nipype/interfaces/camino/tests/test_auto_TrackBedpostxDeter.py +++ b/nipype/interfaces/camino/tests/test_auto_TrackBedpostxDeter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import TrackBedpostxDeter diff --git a/nipype/interfaces/camino/tests/test_auto_TrackBedpostxProba.py b/nipype/interfaces/camino/tests/test_auto_TrackBedpostxProba.py index b37cf9e550..f23fb143d4 100644 --- a/nipype/interfaces/camino/tests/test_auto_TrackBedpostxProba.py +++ b/nipype/interfaces/camino/tests/test_auto_TrackBedpostxProba.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import TrackBedpostxProba diff --git a/nipype/interfaces/camino/tests/test_auto_TrackBootstrap.py b/nipype/interfaces/camino/tests/test_auto_TrackBootstrap.py index dec2509b1f..589d7afe9c 100644 --- a/nipype/interfaces/camino/tests/test_auto_TrackBootstrap.py +++ b/nipype/interfaces/camino/tests/test_auto_TrackBootstrap.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import TrackBootstrap diff --git a/nipype/interfaces/camino/tests/test_auto_TrackDT.py b/nipype/interfaces/camino/tests/test_auto_TrackDT.py index ace97fc8f7..4b95e8f53f 100644 --- a/nipype/interfaces/camino/tests/test_auto_TrackDT.py +++ b/nipype/interfaces/camino/tests/test_auto_TrackDT.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import TrackDT diff --git a/nipype/interfaces/camino/tests/test_auto_TrackPICo.py b/nipype/interfaces/camino/tests/test_auto_TrackPICo.py index e28e87dc8f..b3c69bc0b7 100644 --- a/nipype/interfaces/camino/tests/test_auto_TrackPICo.py +++ b/nipype/interfaces/camino/tests/test_auto_TrackPICo.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import TrackPICo diff --git a/nipype/interfaces/camino/tests/test_auto_TractShredder.py b/nipype/interfaces/camino/tests/test_auto_TractShredder.py index e4df010c60..150333d0eb 100644 --- a/nipype/interfaces/camino/tests/test_auto_TractShredder.py +++ b/nipype/interfaces/camino/tests/test_auto_TractShredder.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..convert import TractShredder diff --git a/nipype/interfaces/camino/tests/test_auto_VtkStreamlines.py b/nipype/interfaces/camino/tests/test_auto_VtkStreamlines.py index bd8d295572..251c82009d 100644 --- a/nipype/interfaces/camino/tests/test_auto_VtkStreamlines.py +++ b/nipype/interfaces/camino/tests/test_auto_VtkStreamlines.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..convert import VtkStreamlines diff --git a/nipype/interfaces/camino/utils.py b/nipype/interfaces/camino/utils.py index 57fcd58d9a..6cfba21653 100644 --- a/nipype/interfaces/camino/utils.py +++ b/nipype/interfaces/camino/utils.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os from ..base import (traits, TraitedSpec, File, CommandLine, diff --git a/nipype/interfaces/camino2trackvis/convert.py b/nipype/interfaces/camino2trackvis/convert.py index 573ddffe2d..3f5664b975 100644 --- a/nipype/interfaces/camino2trackvis/convert.py +++ b/nipype/interfaces/camino2trackvis/convert.py @@ -2,8 +2,6 @@ """ Provides interfaces to various commands provided by Camino-Trackvis """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os diff --git a/nipype/interfaces/camino2trackvis/tests/test_auto_Camino2Trackvis.py b/nipype/interfaces/camino2trackvis/tests/test_auto_Camino2Trackvis.py index 4a88a119fb..a78832f1a1 100644 --- a/nipype/interfaces/camino2trackvis/tests/test_auto_Camino2Trackvis.py +++ b/nipype/interfaces/camino2trackvis/tests/test_auto_Camino2Trackvis.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..convert import Camino2Trackvis diff --git a/nipype/interfaces/camino2trackvis/tests/test_auto_Trackvis2Camino.py b/nipype/interfaces/camino2trackvis/tests/test_auto_Trackvis2Camino.py index f54284fe50..3d733966b4 100644 --- a/nipype/interfaces/camino2trackvis/tests/test_auto_Trackvis2Camino.py +++ b/nipype/interfaces/camino2trackvis/tests/test_auto_Trackvis2Camino.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..convert import Trackvis2Camino diff --git a/nipype/interfaces/cmtk/cmtk.py b/nipype/interfaces/cmtk/cmtk.py index 20293ab630..8eb038e89c 100644 --- a/nipype/interfaces/cmtk/cmtk.py +++ b/nipype/interfaces/cmtk/cmtk.py @@ -1,10 +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) -from builtins import range, open - import pickle import os.path as op diff --git a/nipype/interfaces/cmtk/convert.py b/nipype/interfaces/cmtk/convert.py index 93802d5eb8..170ca44366 100644 --- a/nipype/interfaces/cmtk/convert.py +++ b/nipype/interfaces/cmtk/convert.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os import os.path as op diff --git a/nipype/interfaces/cmtk/nbs.py b/nipype/interfaces/cmtk/nbs.py index f21f2b33ea..19425d2977 100644 --- a/nipype/interfaces/cmtk/nbs.py +++ b/nipype/interfaces/cmtk/nbs.py @@ -1,8 +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.path as op diff --git a/nipype/interfaces/cmtk/nx.py b/nipype/interfaces/cmtk/nx.py index cd6ad4877e..7fb47da6ac 100644 --- a/nipype/interfaces/cmtk/nx.py +++ b/nipype/interfaces/cmtk/nx.py @@ -1,10 +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) -from builtins import str, open, range - import os.path as op import pickle diff --git a/nipype/interfaces/cmtk/parcellation.py b/nipype/interfaces/cmtk/parcellation.py index 0e25e8eb10..a80c4e895f 100644 --- a/nipype/interfaces/cmtk/parcellation.py +++ b/nipype/interfaces/cmtk/parcellation.py @@ -1,10 +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) -from builtins import range - import os import os.path as op import shutil diff --git a/nipype/interfaces/cmtk/tests/test_auto_AverageNetworks.py b/nipype/interfaces/cmtk/tests/test_auto_AverageNetworks.py index bf7b1a8553..5ed036dabd 100644 --- a/nipype/interfaces/cmtk/tests/test_auto_AverageNetworks.py +++ b/nipype/interfaces/cmtk/tests/test_auto_AverageNetworks.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..nx import AverageNetworks diff --git a/nipype/interfaces/cmtk/tests/test_auto_CFFBaseInterface.py b/nipype/interfaces/cmtk/tests/test_auto_CFFBaseInterface.py index 942f477518..449ffe2c8c 100644 --- a/nipype/interfaces/cmtk/tests/test_auto_CFFBaseInterface.py +++ b/nipype/interfaces/cmtk/tests/test_auto_CFFBaseInterface.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import CFFBaseInterface diff --git a/nipype/interfaces/cmtk/tests/test_auto_CFFConverter.py b/nipype/interfaces/cmtk/tests/test_auto_CFFConverter.py index 254aa23d6f..7a3f837709 100644 --- a/nipype/interfaces/cmtk/tests/test_auto_CFFConverter.py +++ b/nipype/interfaces/cmtk/tests/test_auto_CFFConverter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..convert import CFFConverter diff --git a/nipype/interfaces/cmtk/tests/test_auto_CreateMatrix.py b/nipype/interfaces/cmtk/tests/test_auto_CreateMatrix.py index 282e343c07..4939b9301a 100644 --- a/nipype/interfaces/cmtk/tests/test_auto_CreateMatrix.py +++ b/nipype/interfaces/cmtk/tests/test_auto_CreateMatrix.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..cmtk import CreateMatrix diff --git a/nipype/interfaces/cmtk/tests/test_auto_CreateNodes.py b/nipype/interfaces/cmtk/tests/test_auto_CreateNodes.py index ada2fa4b6a..95b810459c 100644 --- a/nipype/interfaces/cmtk/tests/test_auto_CreateNodes.py +++ b/nipype/interfaces/cmtk/tests/test_auto_CreateNodes.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..cmtk import CreateNodes diff --git a/nipype/interfaces/cmtk/tests/test_auto_MergeCNetworks.py b/nipype/interfaces/cmtk/tests/test_auto_MergeCNetworks.py index 770b225e13..3ba3588882 100644 --- a/nipype/interfaces/cmtk/tests/test_auto_MergeCNetworks.py +++ b/nipype/interfaces/cmtk/tests/test_auto_MergeCNetworks.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..convert import MergeCNetworks diff --git a/nipype/interfaces/cmtk/tests/test_auto_NetworkBasedStatistic.py b/nipype/interfaces/cmtk/tests/test_auto_NetworkBasedStatistic.py index ac41946548..fe805cb134 100644 --- a/nipype/interfaces/cmtk/tests/test_auto_NetworkBasedStatistic.py +++ b/nipype/interfaces/cmtk/tests/test_auto_NetworkBasedStatistic.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..nbs import NetworkBasedStatistic diff --git a/nipype/interfaces/cmtk/tests/test_auto_NetworkXMetrics.py b/nipype/interfaces/cmtk/tests/test_auto_NetworkXMetrics.py index 09b661a3fb..638fe596f5 100644 --- a/nipype/interfaces/cmtk/tests/test_auto_NetworkXMetrics.py +++ b/nipype/interfaces/cmtk/tests/test_auto_NetworkXMetrics.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..nx import NetworkXMetrics diff --git a/nipype/interfaces/cmtk/tests/test_auto_Parcellate.py b/nipype/interfaces/cmtk/tests/test_auto_Parcellate.py index ca7609298a..f4d8eb8141 100644 --- a/nipype/interfaces/cmtk/tests/test_auto_Parcellate.py +++ b/nipype/interfaces/cmtk/tests/test_auto_Parcellate.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..parcellation import Parcellate diff --git a/nipype/interfaces/cmtk/tests/test_auto_ROIGen.py b/nipype/interfaces/cmtk/tests/test_auto_ROIGen.py index 0d6383f391..da70979685 100644 --- a/nipype/interfaces/cmtk/tests/test_auto_ROIGen.py +++ b/nipype/interfaces/cmtk/tests/test_auto_ROIGen.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..cmtk import ROIGen diff --git a/nipype/interfaces/cmtk/tests/test_nbs.py b/nipype/interfaces/cmtk/tests/test_nbs.py index be3008fb09..a03b00de0f 100644 --- a/nipype/interfaces/cmtk/tests/test_nbs.py +++ b/nipype/interfaces/cmtk/tests/test_nbs.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from ..nbs import NetworkBasedStatistic from ....utils.misc import package_check import numpy as np diff --git a/nipype/interfaces/dcm2nii.py b/nipype/interfaces/dcm2nii.py index 2635d8e78b..0e7c120df8 100644 --- a/nipype/interfaces/dcm2nii.py +++ b/nipype/interfaces/dcm2nii.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- """The dcm2nii module provides basic functions for dicom conversion """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import str, open import os import re from copy import deepcopy diff --git a/nipype/interfaces/dcmstack.py b/nipype/interfaces/dcmstack.py index 626cabe6cf..711d84920f 100644 --- a/nipype/interfaces/dcmstack.py +++ b/nipype/interfaces/dcmstack.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- """Provides interfaces to various commands provided by dcmstack """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os from os import path as op diff --git a/nipype/interfaces/diffusion_toolkit/base.py b/nipype/interfaces/diffusion_toolkit/base.py index c8e3a17c61..bac8e781d1 100644 --- a/nipype/interfaces/diffusion_toolkit/base.py +++ b/nipype/interfaces/diffusion_toolkit/base.py @@ -13,9 +13,6 @@ See the docstrings for the individual classes for 'working' examples. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import object import re from ..base import CommandLine diff --git a/nipype/interfaces/diffusion_toolkit/dti.py b/nipype/interfaces/diffusion_toolkit/dti.py index f6776c2e95..793641a5d7 100644 --- a/nipype/interfaces/diffusion_toolkit/dti.py +++ b/nipype/interfaces/diffusion_toolkit/dti.py @@ -3,10 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Provides interfaces to various commands provided by diffusion toolkit """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range, open - import os import re diff --git a/nipype/interfaces/diffusion_toolkit/odf.py b/nipype/interfaces/diffusion_toolkit/odf.py index cf4eb683a2..9c2d6d2505 100644 --- a/nipype/interfaces/diffusion_toolkit/odf.py +++ b/nipype/interfaces/diffusion_toolkit/odf.py @@ -3,10 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Provides interfaces to various commands provided by diffusion toolkit """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range - import os import re diff --git a/nipype/interfaces/diffusion_toolkit/postproc.py b/nipype/interfaces/diffusion_toolkit/postproc.py index 20aaeea927..19cafe8d7d 100644 --- a/nipype/interfaces/diffusion_toolkit/postproc.py +++ b/nipype/interfaces/diffusion_toolkit/postproc.py @@ -3,8 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Provides interfaces to various commands provided by diffusion toolkit """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os from ..base import (TraitedSpec, File, traits, CommandLine, InputMultiPath, diff --git a/nipype/interfaces/diffusion_toolkit/tests/test_auto_DTIRecon.py b/nipype/interfaces/diffusion_toolkit/tests/test_auto_DTIRecon.py index c4faac0a67..8623872a7e 100644 --- a/nipype/interfaces/diffusion_toolkit/tests/test_auto_DTIRecon.py +++ b/nipype/interfaces/diffusion_toolkit/tests/test_auto_DTIRecon.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import DTIRecon diff --git a/nipype/interfaces/diffusion_toolkit/tests/test_auto_DTITracker.py b/nipype/interfaces/diffusion_toolkit/tests/test_auto_DTITracker.py index 3fd69ee6b8..2f4f3417ef 100644 --- a/nipype/interfaces/diffusion_toolkit/tests/test_auto_DTITracker.py +++ b/nipype/interfaces/diffusion_toolkit/tests/test_auto_DTITracker.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import DTITracker diff --git a/nipype/interfaces/diffusion_toolkit/tests/test_auto_HARDIMat.py b/nipype/interfaces/diffusion_toolkit/tests/test_auto_HARDIMat.py index 5391290021..d043890f9d 100644 --- a/nipype/interfaces/diffusion_toolkit/tests/test_auto_HARDIMat.py +++ b/nipype/interfaces/diffusion_toolkit/tests/test_auto_HARDIMat.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..odf import HARDIMat diff --git a/nipype/interfaces/diffusion_toolkit/tests/test_auto_ODFRecon.py b/nipype/interfaces/diffusion_toolkit/tests/test_auto_ODFRecon.py index c7a2d30989..e1f6ad47b6 100644 --- a/nipype/interfaces/diffusion_toolkit/tests/test_auto_ODFRecon.py +++ b/nipype/interfaces/diffusion_toolkit/tests/test_auto_ODFRecon.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..odf import ODFRecon diff --git a/nipype/interfaces/diffusion_toolkit/tests/test_auto_ODFTracker.py b/nipype/interfaces/diffusion_toolkit/tests/test_auto_ODFTracker.py index 3973421df8..805c28831e 100644 --- a/nipype/interfaces/diffusion_toolkit/tests/test_auto_ODFTracker.py +++ b/nipype/interfaces/diffusion_toolkit/tests/test_auto_ODFTracker.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..odf import ODFTracker diff --git a/nipype/interfaces/diffusion_toolkit/tests/test_auto_SplineFilter.py b/nipype/interfaces/diffusion_toolkit/tests/test_auto_SplineFilter.py index 85c0d08d13..53074aab81 100644 --- a/nipype/interfaces/diffusion_toolkit/tests/test_auto_SplineFilter.py +++ b/nipype/interfaces/diffusion_toolkit/tests/test_auto_SplineFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..postproc import SplineFilter diff --git a/nipype/interfaces/diffusion_toolkit/tests/test_auto_TrackMerge.py b/nipype/interfaces/diffusion_toolkit/tests/test_auto_TrackMerge.py index cf9756887a..9fea4d1b5e 100644 --- a/nipype/interfaces/diffusion_toolkit/tests/test_auto_TrackMerge.py +++ b/nipype/interfaces/diffusion_toolkit/tests/test_auto_TrackMerge.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..postproc import TrackMerge diff --git a/nipype/interfaces/dipy/anisotropic_power.py b/nipype/interfaces/dipy/anisotropic_power.py index e28ae2bd19..21208326f4 100644 --- a/nipype/interfaces/dipy/anisotropic_power.py +++ b/nipype/interfaces/dipy/anisotropic_power.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import nibabel as nb diff --git a/nipype/interfaces/dipy/base.py b/nipype/interfaces/dipy/base.py index 3e0e064bb4..93546b69ac 100644 --- a/nipype/interfaces/dipy/base.py +++ b/nipype/interfaces/dipy/base.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- """ Base interfaces for dipy """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os.path as op import inspect diff --git a/nipype/interfaces/dipy/preprocess.py b/nipype/interfaces/dipy/preprocess.py index 117351bf22..03686e0258 100644 --- a/nipype/interfaces/dipy/preprocess.py +++ b/nipype/interfaces/dipy/preprocess.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os.path as op import nibabel as nb diff --git a/nipype/interfaces/dipy/reconstruction.py b/nipype/interfaces/dipy/reconstruction.py index 6c7c3a847b..9351d1e400 100644 --- a/nipype/interfaces/dipy/reconstruction.py +++ b/nipype/interfaces/dipy/reconstruction.py @@ -3,12 +3,6 @@ Interfaces to the reconstruction algorithms in dipy """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from future import standard_library -standard_library.install_aliases() -from builtins import str, open - import os.path as op import numpy as np diff --git a/nipype/interfaces/dipy/setup.py b/nipype/interfaces/dipy/setup.py index e6c8f000b2..408d7af731 100644 --- a/nipype/interfaces/dipy/setup.py +++ b/nipype/interfaces/dipy/setup.py @@ -1,8 +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) def configuration(parent_package='', top_path=None): diff --git a/nipype/interfaces/dipy/simulate.py b/nipype/interfaces/dipy/simulate.py index b50b150f24..dfab8b2118 100644 --- a/nipype/interfaces/dipy/simulate.py +++ b/nipype/interfaces/dipy/simulate.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) from multiprocessing import (Pool, cpu_count) import os.path as op -from builtins import range import numpy as np import nibabel as nb diff --git a/nipype/interfaces/dipy/tensors.py b/nipype/interfaces/dipy/tensors.py index 33f5a73b08..3dc06c0356 100644 --- a/nipype/interfaces/dipy/tensors.py +++ b/nipype/interfaces/dipy/tensors.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import nibabel as nb diff --git a/nipype/interfaces/dipy/tests/test_auto_APMQball.py b/nipype/interfaces/dipy/tests/test_auto_APMQball.py index b50bd96b58..35a73b8d87 100644 --- a/nipype/interfaces/dipy/tests/test_auto_APMQball.py +++ b/nipype/interfaces/dipy/tests/test_auto_APMQball.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..anisotropic_power import APMQball diff --git a/nipype/interfaces/dipy/tests/test_auto_CSD.py b/nipype/interfaces/dipy/tests/test_auto_CSD.py index 1343c0ddd7..dde8f52295 100644 --- a/nipype/interfaces/dipy/tests/test_auto_CSD.py +++ b/nipype/interfaces/dipy/tests/test_auto_CSD.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..reconstruction import CSD diff --git a/nipype/interfaces/dipy/tests/test_auto_DTI.py b/nipype/interfaces/dipy/tests/test_auto_DTI.py index c1c22c6263..be2b3375af 100644 --- a/nipype/interfaces/dipy/tests/test_auto_DTI.py +++ b/nipype/interfaces/dipy/tests/test_auto_DTI.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tensors import DTI diff --git a/nipype/interfaces/dipy/tests/test_auto_Denoise.py b/nipype/interfaces/dipy/tests/test_auto_Denoise.py index 57beb6e06f..c76fc9b18a 100644 --- a/nipype/interfaces/dipy/tests/test_auto_Denoise.py +++ b/nipype/interfaces/dipy/tests/test_auto_Denoise.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Denoise diff --git a/nipype/interfaces/dipy/tests/test_auto_DipyBaseInterface.py b/nipype/interfaces/dipy/tests/test_auto_DipyBaseInterface.py index e133e266c4..d422dc5290 100644 --- a/nipype/interfaces/dipy/tests/test_auto_DipyBaseInterface.py +++ b/nipype/interfaces/dipy/tests/test_auto_DipyBaseInterface.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import DipyBaseInterface diff --git a/nipype/interfaces/dipy/tests/test_auto_DipyDiffusionInterface.py b/nipype/interfaces/dipy/tests/test_auto_DipyDiffusionInterface.py index 99249e3506..48940061f8 100644 --- a/nipype/interfaces/dipy/tests/test_auto_DipyDiffusionInterface.py +++ b/nipype/interfaces/dipy/tests/test_auto_DipyDiffusionInterface.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import DipyDiffusionInterface diff --git a/nipype/interfaces/dipy/tests/test_auto_EstimateResponseSH.py b/nipype/interfaces/dipy/tests/test_auto_EstimateResponseSH.py index bf18299fd4..a3ca7819a9 100644 --- a/nipype/interfaces/dipy/tests/test_auto_EstimateResponseSH.py +++ b/nipype/interfaces/dipy/tests/test_auto_EstimateResponseSH.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..reconstruction import EstimateResponseSH diff --git a/nipype/interfaces/dipy/tests/test_auto_RESTORE.py b/nipype/interfaces/dipy/tests/test_auto_RESTORE.py index 9f4e52ee66..0795f4ea16 100644 --- a/nipype/interfaces/dipy/tests/test_auto_RESTORE.py +++ b/nipype/interfaces/dipy/tests/test_auto_RESTORE.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..reconstruction import RESTORE diff --git a/nipype/interfaces/dipy/tests/test_auto_Resample.py b/nipype/interfaces/dipy/tests/test_auto_Resample.py index a3e44c942a..044fdbe8f7 100644 --- a/nipype/interfaces/dipy/tests/test_auto_Resample.py +++ b/nipype/interfaces/dipy/tests/test_auto_Resample.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Resample diff --git a/nipype/interfaces/dipy/tests/test_auto_SimulateMultiTensor.py b/nipype/interfaces/dipy/tests/test_auto_SimulateMultiTensor.py index 48a12ec076..12eea9e961 100644 --- a/nipype/interfaces/dipy/tests/test_auto_SimulateMultiTensor.py +++ b/nipype/interfaces/dipy/tests/test_auto_SimulateMultiTensor.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..simulate import SimulateMultiTensor diff --git a/nipype/interfaces/dipy/tests/test_auto_StreamlineTractography.py b/nipype/interfaces/dipy/tests/test_auto_StreamlineTractography.py index 71c20e8ec9..c88795ca1c 100644 --- a/nipype/interfaces/dipy/tests/test_auto_StreamlineTractography.py +++ b/nipype/interfaces/dipy/tests/test_auto_StreamlineTractography.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tracks import StreamlineTractography diff --git a/nipype/interfaces/dipy/tests/test_auto_TensorMode.py b/nipype/interfaces/dipy/tests/test_auto_TensorMode.py index 532b930c80..274c9dbc77 100644 --- a/nipype/interfaces/dipy/tests/test_auto_TensorMode.py +++ b/nipype/interfaces/dipy/tests/test_auto_TensorMode.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tensors import TensorMode diff --git a/nipype/interfaces/dipy/tests/test_auto_TrackDensityMap.py b/nipype/interfaces/dipy/tests/test_auto_TrackDensityMap.py index f1112421f5..a52b40e0fa 100644 --- a/nipype/interfaces/dipy/tests/test_auto_TrackDensityMap.py +++ b/nipype/interfaces/dipy/tests/test_auto_TrackDensityMap.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tracks import TrackDensityMap diff --git a/nipype/interfaces/dipy/tracks.py b/nipype/interfaces/dipy/tracks.py index 81d76d1ef5..8688b8d106 100644 --- a/nipype/interfaces/dipy/tracks.py +++ b/nipype/interfaces/dipy/tracks.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os.path as op import numpy as np diff --git a/nipype/interfaces/dtitk/base.py b/nipype/interfaces/dtitk/base.py index 5cfb81d9dd..32289e5217 100644 --- a/nipype/interfaces/dtitk/base.py +++ b/nipype/interfaces/dtitk/base.py @@ -25,9 +25,6 @@ See the docstrings of the individual classes for examples. """ -from __future__ import print_function, division, unicode_literals, \ - absolute_import - import os from ... import logging diff --git a/nipype/interfaces/dtitk/tests/test_auto_AffScalarVol.py b/nipype/interfaces/dtitk/tests/test_auto_AffScalarVol.py index f0d6da8d09..b6a6128a5f 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_AffScalarVol.py +++ b/nipype/interfaces/dtitk/tests/test_auto_AffScalarVol.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import AffScalarVol diff --git a/nipype/interfaces/dtitk/tests/test_auto_AffSymTensor3DVol.py b/nipype/interfaces/dtitk/tests/test_auto_AffSymTensor3DVol.py index dd40117ace..658f8c7baa 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_AffSymTensor3DVol.py +++ b/nipype/interfaces/dtitk/tests/test_auto_AffSymTensor3DVol.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import AffSymTensor3DVol diff --git a/nipype/interfaces/dtitk/tests/test_auto_Affine.py b/nipype/interfaces/dtitk/tests/test_auto_Affine.py index 89383c159d..4469168d12 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_Affine.py +++ b/nipype/interfaces/dtitk/tests/test_auto_Affine.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import Affine diff --git a/nipype/interfaces/dtitk/tests/test_auto_AffineTask.py b/nipype/interfaces/dtitk/tests/test_auto_AffineTask.py index dadba5445f..873c92e7ca 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_AffineTask.py +++ b/nipype/interfaces/dtitk/tests/test_auto_AffineTask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import AffineTask diff --git a/nipype/interfaces/dtitk/tests/test_auto_BinThresh.py b/nipype/interfaces/dtitk/tests/test_auto_BinThresh.py index 9872df1ee3..cfd748dcb2 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_BinThresh.py +++ b/nipype/interfaces/dtitk/tests/test_auto_BinThresh.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import BinThresh diff --git a/nipype/interfaces/dtitk/tests/test_auto_BinThreshTask.py b/nipype/interfaces/dtitk/tests/test_auto_BinThreshTask.py index a3cdcb5149..155c5a8406 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_BinThreshTask.py +++ b/nipype/interfaces/dtitk/tests/test_auto_BinThreshTask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import BinThreshTask diff --git a/nipype/interfaces/dtitk/tests/test_auto_CommandLineDtitk.py b/nipype/interfaces/dtitk/tests/test_auto_CommandLineDtitk.py index b43fcc5e97..2e064a3150 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_CommandLineDtitk.py +++ b/nipype/interfaces/dtitk/tests/test_auto_CommandLineDtitk.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import CommandLineDtitk diff --git a/nipype/interfaces/dtitk/tests/test_auto_ComposeXfm.py b/nipype/interfaces/dtitk/tests/test_auto_ComposeXfm.py index a325f68b9f..17b31df738 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_ComposeXfm.py +++ b/nipype/interfaces/dtitk/tests/test_auto_ComposeXfm.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import ComposeXfm diff --git a/nipype/interfaces/dtitk/tests/test_auto_ComposeXfmTask.py b/nipype/interfaces/dtitk/tests/test_auto_ComposeXfmTask.py index 52bbd5cbcb..2ad8ce96ab 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_ComposeXfmTask.py +++ b/nipype/interfaces/dtitk/tests/test_auto_ComposeXfmTask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import ComposeXfmTask diff --git a/nipype/interfaces/dtitk/tests/test_auto_Diffeo.py b/nipype/interfaces/dtitk/tests/test_auto_Diffeo.py index 66d28957de..cc960e36d5 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_Diffeo.py +++ b/nipype/interfaces/dtitk/tests/test_auto_Diffeo.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import Diffeo diff --git a/nipype/interfaces/dtitk/tests/test_auto_DiffeoScalarVol.py b/nipype/interfaces/dtitk/tests/test_auto_DiffeoScalarVol.py index 0d459d7a0b..9924e1b8e3 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_DiffeoScalarVol.py +++ b/nipype/interfaces/dtitk/tests/test_auto_DiffeoScalarVol.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import DiffeoScalarVol diff --git a/nipype/interfaces/dtitk/tests/test_auto_DiffeoSymTensor3DVol.py b/nipype/interfaces/dtitk/tests/test_auto_DiffeoSymTensor3DVol.py index a051d9f60f..a51cbd2314 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_DiffeoSymTensor3DVol.py +++ b/nipype/interfaces/dtitk/tests/test_auto_DiffeoSymTensor3DVol.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import DiffeoSymTensor3DVol diff --git a/nipype/interfaces/dtitk/tests/test_auto_DiffeoTask.py b/nipype/interfaces/dtitk/tests/test_auto_DiffeoTask.py index 8d78b37a55..5ba67405ea 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_DiffeoTask.py +++ b/nipype/interfaces/dtitk/tests/test_auto_DiffeoTask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import DiffeoTask diff --git a/nipype/interfaces/dtitk/tests/test_auto_Rigid.py b/nipype/interfaces/dtitk/tests/test_auto_Rigid.py index 6e9bf18764..4d968093c4 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_Rigid.py +++ b/nipype/interfaces/dtitk/tests/test_auto_Rigid.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import Rigid diff --git a/nipype/interfaces/dtitk/tests/test_auto_RigidTask.py b/nipype/interfaces/dtitk/tests/test_auto_RigidTask.py index 987888d80f..93658d5d40 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_RigidTask.py +++ b/nipype/interfaces/dtitk/tests/test_auto_RigidTask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import RigidTask diff --git a/nipype/interfaces/dtitk/tests/test_auto_SVAdjustVoxSp.py b/nipype/interfaces/dtitk/tests/test_auto_SVAdjustVoxSp.py index 51a9bbe4b5..9091868546 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_SVAdjustVoxSp.py +++ b/nipype/interfaces/dtitk/tests/test_auto_SVAdjustVoxSp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import SVAdjustVoxSp diff --git a/nipype/interfaces/dtitk/tests/test_auto_SVAdjustVoxSpTask.py b/nipype/interfaces/dtitk/tests/test_auto_SVAdjustVoxSpTask.py index 0c051ef5d2..c1b4dc619a 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_SVAdjustVoxSpTask.py +++ b/nipype/interfaces/dtitk/tests/test_auto_SVAdjustVoxSpTask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import SVAdjustVoxSpTask diff --git a/nipype/interfaces/dtitk/tests/test_auto_SVResample.py b/nipype/interfaces/dtitk/tests/test_auto_SVResample.py index 880366e412..6aecbc29c9 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_SVResample.py +++ b/nipype/interfaces/dtitk/tests/test_auto_SVResample.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import SVResample diff --git a/nipype/interfaces/dtitk/tests/test_auto_SVResampleTask.py b/nipype/interfaces/dtitk/tests/test_auto_SVResampleTask.py index 1a8ea16023..92efe23e44 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_SVResampleTask.py +++ b/nipype/interfaces/dtitk/tests/test_auto_SVResampleTask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import SVResampleTask diff --git a/nipype/interfaces/dtitk/tests/test_auto_TVAdjustOriginTask.py b/nipype/interfaces/dtitk/tests/test_auto_TVAdjustOriginTask.py index 3f8f236a6b..406ffcb418 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_TVAdjustOriginTask.py +++ b/nipype/interfaces/dtitk/tests/test_auto_TVAdjustOriginTask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import TVAdjustOriginTask diff --git a/nipype/interfaces/dtitk/tests/test_auto_TVAdjustVoxSp.py b/nipype/interfaces/dtitk/tests/test_auto_TVAdjustVoxSp.py index 9165dce54a..1d2a9fa6b5 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_TVAdjustVoxSp.py +++ b/nipype/interfaces/dtitk/tests/test_auto_TVAdjustVoxSp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import TVAdjustVoxSp diff --git a/nipype/interfaces/dtitk/tests/test_auto_TVAdjustVoxSpTask.py b/nipype/interfaces/dtitk/tests/test_auto_TVAdjustVoxSpTask.py index a04f1078b4..6bd1f4601f 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_TVAdjustVoxSpTask.py +++ b/nipype/interfaces/dtitk/tests/test_auto_TVAdjustVoxSpTask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import TVAdjustVoxSpTask diff --git a/nipype/interfaces/dtitk/tests/test_auto_TVResample.py b/nipype/interfaces/dtitk/tests/test_auto_TVResample.py index fe7b7bbdbd..f8101d07ab 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_TVResample.py +++ b/nipype/interfaces/dtitk/tests/test_auto_TVResample.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import TVResample diff --git a/nipype/interfaces/dtitk/tests/test_auto_TVResampleTask.py b/nipype/interfaces/dtitk/tests/test_auto_TVResampleTask.py index d2b971fe00..d181ae6bc9 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_TVResampleTask.py +++ b/nipype/interfaces/dtitk/tests/test_auto_TVResampleTask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import TVResampleTask diff --git a/nipype/interfaces/dtitk/tests/test_auto_TVtool.py b/nipype/interfaces/dtitk/tests/test_auto_TVtool.py index 15f06af243..322e226612 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_TVtool.py +++ b/nipype/interfaces/dtitk/tests/test_auto_TVtool.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import TVtool diff --git a/nipype/interfaces/dtitk/tests/test_auto_TVtoolTask.py b/nipype/interfaces/dtitk/tests/test_auto_TVtoolTask.py index eb44949b5d..0699b69687 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_TVtoolTask.py +++ b/nipype/interfaces/dtitk/tests/test_auto_TVtoolTask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import TVtoolTask diff --git a/nipype/interfaces/dtitk/tests/test_auto_affScalarVolTask.py b/nipype/interfaces/dtitk/tests/test_auto_affScalarVolTask.py index e9aeab1260..df6eeaed84 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_affScalarVolTask.py +++ b/nipype/interfaces/dtitk/tests/test_auto_affScalarVolTask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import affScalarVolTask diff --git a/nipype/interfaces/dtitk/tests/test_auto_affSymTensor3DVolTask.py b/nipype/interfaces/dtitk/tests/test_auto_affSymTensor3DVolTask.py index 568a83436f..9d1f491e8e 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_affSymTensor3DVolTask.py +++ b/nipype/interfaces/dtitk/tests/test_auto_affSymTensor3DVolTask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import affSymTensor3DVolTask diff --git a/nipype/interfaces/dtitk/tests/test_auto_diffeoScalarVolTask.py b/nipype/interfaces/dtitk/tests/test_auto_diffeoScalarVolTask.py index b9ed3a7054..062af0c769 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_diffeoScalarVolTask.py +++ b/nipype/interfaces/dtitk/tests/test_auto_diffeoScalarVolTask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import diffeoScalarVolTask diff --git a/nipype/interfaces/dtitk/tests/test_auto_diffeoSymTensor3DVolTask.py b/nipype/interfaces/dtitk/tests/test_auto_diffeoSymTensor3DVolTask.py index 2fc1cd6f6f..1b7a8f03bb 100644 --- a/nipype/interfaces/dtitk/tests/test_auto_diffeoSymTensor3DVolTask.py +++ b/nipype/interfaces/dtitk/tests/test_auto_diffeoSymTensor3DVolTask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import diffeoSymTensor3DVolTask diff --git a/nipype/interfaces/dynamic_slicer.py b/nipype/interfaces/dynamic_slicer.py index 5d3a3c1899..db238127c9 100644 --- a/nipype/interfaces/dynamic_slicer.py +++ b/nipype/interfaces/dynamic_slicer.py @@ -1,8 +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 import warnings diff --git a/nipype/interfaces/elastix/__init__.py b/nipype/interfaces/elastix/__init__.py index 9dcdb88c18..e7ddc2a9f7 100644 --- a/nipype/interfaces/elastix/__init__.py +++ b/nipype/interfaces/elastix/__init__.py @@ -4,7 +4,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Top-level namespace for elastix.""" -from __future__ import absolute_import from .registration import Registration, ApplyWarp, AnalyzeWarp, PointsWarp from .utils import EditTransform diff --git a/nipype/interfaces/elastix/base.py b/nipype/interfaces/elastix/base.py index b47e1fec17..748f69f44d 100644 --- a/nipype/interfaces/elastix/base.py +++ b/nipype/interfaces/elastix/base.py @@ -9,8 +9,6 @@ """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) from ... import logging from ..base import CommandLineInputSpec, Directory, traits diff --git a/nipype/interfaces/elastix/registration.py b/nipype/interfaces/elastix/registration.py index 3a815963a2..539534aada 100644 --- a/nipype/interfaces/elastix/registration.py +++ b/nipype/interfaces/elastix/registration.py @@ -7,10 +7,6 @@ displacement maps to images and points. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open - import os.path as op import re diff --git a/nipype/interfaces/elastix/tests/test_auto_AnalyzeWarp.py b/nipype/interfaces/elastix/tests/test_auto_AnalyzeWarp.py index d246429304..b8eb8686d0 100644 --- a/nipype/interfaces/elastix/tests/test_auto_AnalyzeWarp.py +++ b/nipype/interfaces/elastix/tests/test_auto_AnalyzeWarp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import AnalyzeWarp diff --git a/nipype/interfaces/elastix/tests/test_auto_ApplyWarp.py b/nipype/interfaces/elastix/tests/test_auto_ApplyWarp.py index f13798790d..902928ae02 100644 --- a/nipype/interfaces/elastix/tests/test_auto_ApplyWarp.py +++ b/nipype/interfaces/elastix/tests/test_auto_ApplyWarp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import ApplyWarp diff --git a/nipype/interfaces/elastix/tests/test_auto_EditTransform.py b/nipype/interfaces/elastix/tests/test_auto_EditTransform.py index 7b67511f43..2720e14f44 100644 --- a/nipype/interfaces/elastix/tests/test_auto_EditTransform.py +++ b/nipype/interfaces/elastix/tests/test_auto_EditTransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import EditTransform diff --git a/nipype/interfaces/elastix/tests/test_auto_PointsWarp.py b/nipype/interfaces/elastix/tests/test_auto_PointsWarp.py index cc6be5c6fb..8047d31ecb 100644 --- a/nipype/interfaces/elastix/tests/test_auto_PointsWarp.py +++ b/nipype/interfaces/elastix/tests/test_auto_PointsWarp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import PointsWarp diff --git a/nipype/interfaces/elastix/tests/test_auto_Registration.py b/nipype/interfaces/elastix/tests/test_auto_Registration.py index 0c0d45f863..095d1cd521 100644 --- a/nipype/interfaces/elastix/tests/test_auto_Registration.py +++ b/nipype/interfaces/elastix/tests/test_auto_Registration.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import Registration diff --git a/nipype/interfaces/elastix/utils.py b/nipype/interfaces/elastix/utils.py index 505115b05a..52fd7023a2 100644 --- a/nipype/interfaces/elastix/utils.py +++ b/nipype/interfaces/elastix/utils.py @@ -7,10 +7,6 @@ transform files (to configure warpings) """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open - import os.path as op from ... import logging diff --git a/nipype/interfaces/freesurfer/base.py b/nipype/interfaces/freesurfer/base.py index ef54cda040..3e82624cce 100644 --- a/nipype/interfaces/freesurfer/base.py +++ b/nipype/interfaces/freesurfer/base.py @@ -14,10 +14,6 @@ See the docstrings for the individual classes for 'working' examples. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open, object, str - import os from ... import LooseVersion diff --git a/nipype/interfaces/freesurfer/longitudinal.py b/nipype/interfaces/freesurfer/longitudinal.py index 1d982a7a44..eed32173b4 100644 --- a/nipype/interfaces/freesurfer/longitudinal.py +++ b/nipype/interfaces/freesurfer/longitudinal.py @@ -3,8 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Provides interfaces to various longitudinal commands provided by freesurfer """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os diff --git a/nipype/interfaces/freesurfer/model.py b/nipype/interfaces/freesurfer/model.py index d1c8dcdc93..526f0a9919 100644 --- a/nipype/interfaces/freesurfer/model.py +++ b/nipype/interfaces/freesurfer/model.py @@ -4,8 +4,6 @@ """The freesurfer module provides basic functions for interfacing with freesurfer tools. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os diff --git a/nipype/interfaces/freesurfer/preprocess.py b/nipype/interfaces/freesurfer/preprocess.py index 682910cfb3..020d1b7899 100644 --- a/nipype/interfaces/freesurfer/preprocess.py +++ b/nipype/interfaces/freesurfer/preprocess.py @@ -3,10 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Provides interfaces to various commands provided by FreeSurfer """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range - import os import os.path as op from glob import glob diff --git a/nipype/interfaces/freesurfer/registration.py b/nipype/interfaces/freesurfer/registration.py index 9cf6fb7b44..1b919485e2 100644 --- a/nipype/interfaces/freesurfer/registration.py +++ b/nipype/interfaces/freesurfer/registration.py @@ -3,8 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Provides interfaces to various longitudinal commands provided by freesurfer """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os import os.path diff --git a/nipype/interfaces/freesurfer/tests/test_BBRegister.py b/nipype/interfaces/freesurfer/tests/test_BBRegister.py index 3e80ad4e9c..81a67742e2 100644 --- a/nipype/interfaces/freesurfer/tests/test_BBRegister.py +++ b/nipype/interfaces/freesurfer/tests/test_BBRegister.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from ..preprocess import BBRegister, BBRegisterInputSpec6 diff --git a/nipype/interfaces/freesurfer/tests/test_FSSurfaceCommand.py b/nipype/interfaces/freesurfer/tests/test_FSSurfaceCommand.py index 704dfeaaf3..bc34a8d7aa 100644 --- a/nipype/interfaces/freesurfer/tests/test_FSSurfaceCommand.py +++ b/nipype/interfaces/freesurfer/tests/test_FSSurfaceCommand.py @@ -1,5 +1,4 @@ # Modified 2017.04.21 by Chris Markiewicz -from __future__ import unicode_literals import pytest from ..base import FSSurfaceCommand diff --git a/nipype/interfaces/freesurfer/tests/test_auto_AddXFormToHeader.py b/nipype/interfaces/freesurfer/tests/test_auto_AddXFormToHeader.py index 03fa095470..f3841d3fc2 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_AddXFormToHeader.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_AddXFormToHeader.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import AddXFormToHeader diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Aparc2Aseg.py b/nipype/interfaces/freesurfer/tests/test_auto_Aparc2Aseg.py index 494ce981c5..9135472d60 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Aparc2Aseg.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Aparc2Aseg.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Aparc2Aseg diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Apas2Aseg.py b/nipype/interfaces/freesurfer/tests/test_auto_Apas2Aseg.py index 03385da2ad..1fde211396 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Apas2Aseg.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Apas2Aseg.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Apas2Aseg diff --git a/nipype/interfaces/freesurfer/tests/test_auto_ApplyMask.py b/nipype/interfaces/freesurfer/tests/test_auto_ApplyMask.py index c4544feb88..fb3a8d956f 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_ApplyMask.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_ApplyMask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ApplyMask diff --git a/nipype/interfaces/freesurfer/tests/test_auto_ApplyVolTransform.py b/nipype/interfaces/freesurfer/tests/test_auto_ApplyVolTransform.py index 753be038df..40b59358f5 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_ApplyVolTransform.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_ApplyVolTransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import ApplyVolTransform diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Binarize.py b/nipype/interfaces/freesurfer/tests/test_auto_Binarize.py index 7dfb9a1815..1e81688dcb 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Binarize.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Binarize.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import Binarize diff --git a/nipype/interfaces/freesurfer/tests/test_auto_CALabel.py b/nipype/interfaces/freesurfer/tests/test_auto_CALabel.py index 4d56d217c7..92af7daff1 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_CALabel.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_CALabel.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import CALabel diff --git a/nipype/interfaces/freesurfer/tests/test_auto_CANormalize.py b/nipype/interfaces/freesurfer/tests/test_auto_CANormalize.py index 5700103e84..086fc8326d 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_CANormalize.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_CANormalize.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import CANormalize diff --git a/nipype/interfaces/freesurfer/tests/test_auto_CARegister.py b/nipype/interfaces/freesurfer/tests/test_auto_CARegister.py index dcf5aa84a8..e26b0951e2 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_CARegister.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_CARegister.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import CARegister diff --git a/nipype/interfaces/freesurfer/tests/test_auto_CheckTalairachAlignment.py b/nipype/interfaces/freesurfer/tests/test_auto_CheckTalairachAlignment.py index fe9c1a3121..ef75f59c2a 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_CheckTalairachAlignment.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_CheckTalairachAlignment.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import CheckTalairachAlignment diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Concatenate.py b/nipype/interfaces/freesurfer/tests/test_auto_Concatenate.py index 72f60e58a8..baee02187b 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Concatenate.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Concatenate.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import Concatenate diff --git a/nipype/interfaces/freesurfer/tests/test_auto_ConcatenateLTA.py b/nipype/interfaces/freesurfer/tests/test_auto_ConcatenateLTA.py index ee1d3ae7f3..07ea2e0d2f 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_ConcatenateLTA.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_ConcatenateLTA.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import ConcatenateLTA diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Contrast.py b/nipype/interfaces/freesurfer/tests/test_auto_Contrast.py index 3cd62e8ee7..d074b8b803 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Contrast.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Contrast.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Contrast diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Curvature.py b/nipype/interfaces/freesurfer/tests/test_auto_Curvature.py index 05bc424830..60351cb36e 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Curvature.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Curvature.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Curvature diff --git a/nipype/interfaces/freesurfer/tests/test_auto_CurvatureStats.py b/nipype/interfaces/freesurfer/tests/test_auto_CurvatureStats.py index f815952eaf..5750487216 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_CurvatureStats.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_CurvatureStats.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import CurvatureStats diff --git a/nipype/interfaces/freesurfer/tests/test_auto_DICOMConvert.py b/nipype/interfaces/freesurfer/tests/test_auto_DICOMConvert.py index 3c0a95c437..8a25f9b33a 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_DICOMConvert.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_DICOMConvert.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import DICOMConvert diff --git a/nipype/interfaces/freesurfer/tests/test_auto_EMRegister.py b/nipype/interfaces/freesurfer/tests/test_auto_EMRegister.py index 2a58c98872..ee33e3fcf2 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_EMRegister.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_EMRegister.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import EMRegister diff --git a/nipype/interfaces/freesurfer/tests/test_auto_EditWMwithAseg.py b/nipype/interfaces/freesurfer/tests/test_auto_EditWMwithAseg.py index 2ca6d59cc2..2794f3960a 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_EditWMwithAseg.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_EditWMwithAseg.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import EditWMwithAseg diff --git a/nipype/interfaces/freesurfer/tests/test_auto_EulerNumber.py b/nipype/interfaces/freesurfer/tests/test_auto_EulerNumber.py index 4ab7d9f45c..47084fc1a3 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_EulerNumber.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_EulerNumber.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import EulerNumber diff --git a/nipype/interfaces/freesurfer/tests/test_auto_ExtractMainComponent.py b/nipype/interfaces/freesurfer/tests/test_auto_ExtractMainComponent.py index dba95bb3ba..e664c9feb9 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_ExtractMainComponent.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_ExtractMainComponent.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ExtractMainComponent diff --git a/nipype/interfaces/freesurfer/tests/test_auto_FSCommand.py b/nipype/interfaces/freesurfer/tests/test_auto_FSCommand.py index 0546d99006..dc7678e7e6 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_FSCommand.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_FSCommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import FSCommand diff --git a/nipype/interfaces/freesurfer/tests/test_auto_FSCommandOpenMP.py b/nipype/interfaces/freesurfer/tests/test_auto_FSCommandOpenMP.py index 5b8bca1484..b4c56e8aeb 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_FSCommandOpenMP.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_FSCommandOpenMP.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import FSCommandOpenMP diff --git a/nipype/interfaces/freesurfer/tests/test_auto_FSScriptCommand.py b/nipype/interfaces/freesurfer/tests/test_auto_FSScriptCommand.py index e791bb5976..39b16b845e 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_FSScriptCommand.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_FSScriptCommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import FSScriptCommand diff --git a/nipype/interfaces/freesurfer/tests/test_auto_FitMSParams.py b/nipype/interfaces/freesurfer/tests/test_auto_FitMSParams.py index 35dae21d21..098f20f8b1 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_FitMSParams.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_FitMSParams.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import FitMSParams diff --git a/nipype/interfaces/freesurfer/tests/test_auto_FixTopology.py b/nipype/interfaces/freesurfer/tests/test_auto_FixTopology.py index 83427dcd20..a95e5bbc5a 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_FixTopology.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_FixTopology.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import FixTopology diff --git a/nipype/interfaces/freesurfer/tests/test_auto_FuseSegmentations.py b/nipype/interfaces/freesurfer/tests/test_auto_FuseSegmentations.py index d2d7467df1..7b5c940935 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_FuseSegmentations.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_FuseSegmentations.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..longitudinal import FuseSegmentations diff --git a/nipype/interfaces/freesurfer/tests/test_auto_GLMFit.py b/nipype/interfaces/freesurfer/tests/test_auto_GLMFit.py index f2f6a5899f..1a4e966239 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_GLMFit.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_GLMFit.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import GLMFit diff --git a/nipype/interfaces/freesurfer/tests/test_auto_ImageInfo.py b/nipype/interfaces/freesurfer/tests/test_auto_ImageInfo.py index 28be31b456..9dc4b292dd 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_ImageInfo.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_ImageInfo.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ImageInfo diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Jacobian.py b/nipype/interfaces/freesurfer/tests/test_auto_Jacobian.py index d3f8f16df3..079e50968d 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Jacobian.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Jacobian.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Jacobian diff --git a/nipype/interfaces/freesurfer/tests/test_auto_LTAConvert.py b/nipype/interfaces/freesurfer/tests/test_auto_LTAConvert.py index 0a2df1b8c4..82dd02fe0c 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_LTAConvert.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_LTAConvert.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import LTAConvert diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Label2Annot.py b/nipype/interfaces/freesurfer/tests/test_auto_Label2Annot.py index b7d594dabd..78f7076f92 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Label2Annot.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Label2Annot.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import Label2Annot diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Label2Label.py b/nipype/interfaces/freesurfer/tests/test_auto_Label2Label.py index 4cc1b62ec0..934770875f 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Label2Label.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Label2Label.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import Label2Label diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Label2Vol.py b/nipype/interfaces/freesurfer/tests/test_auto_Label2Vol.py index fe277288d5..11a244e94b 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Label2Vol.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Label2Vol.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import Label2Vol diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MNIBiasCorrection.py b/nipype/interfaces/freesurfer/tests/test_auto_MNIBiasCorrection.py index da6b2f94ec..6ba4926cd3 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MNIBiasCorrection.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MNIBiasCorrection.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import MNIBiasCorrection diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MPRtoMNI305.py b/nipype/interfaces/freesurfer/tests/test_auto_MPRtoMNI305.py index 44d836fac4..3e916cf7dc 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MPRtoMNI305.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MPRtoMNI305.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import MPRtoMNI305 diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MRIConvert.py b/nipype/interfaces/freesurfer/tests/test_auto_MRIConvert.py index d66ad1a4c4..f5ab4ff630 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MRIConvert.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MRIConvert.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import MRIConvert diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MRICoreg.py b/nipype/interfaces/freesurfer/tests/test_auto_MRICoreg.py index 508899d6b0..39076d96a9 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MRICoreg.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MRICoreg.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import MRICoreg diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MRIFill.py b/nipype/interfaces/freesurfer/tests/test_auto_MRIFill.py index 748cc6f5e6..d70da67a50 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MRIFill.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MRIFill.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MRIFill diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MRIMarchingCubes.py b/nipype/interfaces/freesurfer/tests/test_auto_MRIMarchingCubes.py index bd22d3f486..2152aec1e5 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MRIMarchingCubes.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MRIMarchingCubes.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MRIMarchingCubes diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MRIPretess.py b/nipype/interfaces/freesurfer/tests/test_auto_MRIPretess.py index ff07c64b42..578d09d9fb 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MRIPretess.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MRIPretess.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MRIPretess diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MRISPreproc.py b/nipype/interfaces/freesurfer/tests/test_auto_MRISPreproc.py index 2208760d74..fab549d02f 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MRISPreproc.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MRISPreproc.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import MRISPreproc diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MRISPreprocReconAll.py b/nipype/interfaces/freesurfer/tests/test_auto_MRISPreprocReconAll.py index 3c36fd6a43..d7a138015a 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MRISPreprocReconAll.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MRISPreprocReconAll.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import MRISPreprocReconAll diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MRITessellate.py b/nipype/interfaces/freesurfer/tests/test_auto_MRITessellate.py index 315cfd7e2f..464eddb043 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MRITessellate.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MRITessellate.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MRITessellate diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MRIsCALabel.py b/nipype/interfaces/freesurfer/tests/test_auto_MRIsCALabel.py index eaf91bc1e8..0bac91b343 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MRIsCALabel.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MRIsCALabel.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import MRIsCALabel diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MRIsCalc.py b/nipype/interfaces/freesurfer/tests/test_auto_MRIsCalc.py index 296b7726a7..be72b4814f 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MRIsCalc.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MRIsCalc.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MRIsCalc diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MRIsCombine.py b/nipype/interfaces/freesurfer/tests/test_auto_MRIsCombine.py index 006dd272e1..9dd2993621 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MRIsCombine.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MRIsCombine.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MRIsCombine diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MRIsConvert.py b/nipype/interfaces/freesurfer/tests/test_auto_MRIsConvert.py index 92c397be96..4c84120d7e 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MRIsConvert.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MRIsConvert.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MRIsConvert diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MRIsExpand.py b/nipype/interfaces/freesurfer/tests/test_auto_MRIsExpand.py index 12f2bfb294..0b0297bcdd 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MRIsExpand.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MRIsExpand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MRIsExpand diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MRIsInflate.py b/nipype/interfaces/freesurfer/tests/test_auto_MRIsInflate.py index 147a26275c..993d578485 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MRIsInflate.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MRIsInflate.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MRIsInflate diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MS_LDA.py b/nipype/interfaces/freesurfer/tests/test_auto_MS_LDA.py index 3d3f5cde11..eb1fbe4043 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MS_LDA.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MS_LDA.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import MS_LDA diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MakeAverageSubject.py b/nipype/interfaces/freesurfer/tests/test_auto_MakeAverageSubject.py index 527bc5135b..48002e6051 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MakeAverageSubject.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MakeAverageSubject.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MakeAverageSubject diff --git a/nipype/interfaces/freesurfer/tests/test_auto_MakeSurfaces.py b/nipype/interfaces/freesurfer/tests/test_auto_MakeSurfaces.py index 3719b3a8af..9cf56f1222 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_MakeSurfaces.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_MakeSurfaces.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MakeSurfaces diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Normalize.py b/nipype/interfaces/freesurfer/tests/test_auto_Normalize.py index baf03f026c..905a8929cd 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Normalize.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Normalize.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Normalize diff --git a/nipype/interfaces/freesurfer/tests/test_auto_OneSampleTTest.py b/nipype/interfaces/freesurfer/tests/test_auto_OneSampleTTest.py index f0d182cb6c..712b4cfaac 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_OneSampleTTest.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_OneSampleTTest.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import OneSampleTTest diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Paint.py b/nipype/interfaces/freesurfer/tests/test_auto_Paint.py index 311af9714b..33c76bbe12 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Paint.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Paint.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import Paint diff --git a/nipype/interfaces/freesurfer/tests/test_auto_ParcellationStats.py b/nipype/interfaces/freesurfer/tests/test_auto_ParcellationStats.py index 8b4ae45d67..85a8747bd0 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_ParcellationStats.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_ParcellationStats.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ParcellationStats diff --git a/nipype/interfaces/freesurfer/tests/test_auto_ParseDICOMDir.py b/nipype/interfaces/freesurfer/tests/test_auto_ParseDICOMDir.py index 148044abd3..7fed3ad587 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_ParseDICOMDir.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_ParseDICOMDir.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import ParseDICOMDir diff --git a/nipype/interfaces/freesurfer/tests/test_auto_ReconAll.py b/nipype/interfaces/freesurfer/tests/test_auto_ReconAll.py index 18a4dfeb43..2d4365e51e 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_ReconAll.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_ReconAll.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import ReconAll diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Register.py b/nipype/interfaces/freesurfer/tests/test_auto_Register.py index 3adccf2139..2d940d131d 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Register.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Register.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import Register diff --git a/nipype/interfaces/freesurfer/tests/test_auto_RegisterAVItoTalairach.py b/nipype/interfaces/freesurfer/tests/test_auto_RegisterAVItoTalairach.py index 5a609f586e..405a9e5c4f 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_RegisterAVItoTalairach.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_RegisterAVItoTalairach.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import RegisterAVItoTalairach diff --git a/nipype/interfaces/freesurfer/tests/test_auto_RelabelHypointensities.py b/nipype/interfaces/freesurfer/tests/test_auto_RelabelHypointensities.py index f99acec899..6258e7b0b7 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_RelabelHypointensities.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_RelabelHypointensities.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import RelabelHypointensities diff --git a/nipype/interfaces/freesurfer/tests/test_auto_RemoveIntersection.py b/nipype/interfaces/freesurfer/tests/test_auto_RemoveIntersection.py index 38afb704c1..2d4a67045b 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_RemoveIntersection.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_RemoveIntersection.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import RemoveIntersection diff --git a/nipype/interfaces/freesurfer/tests/test_auto_RemoveNeck.py b/nipype/interfaces/freesurfer/tests/test_auto_RemoveNeck.py index f99d1ca785..18dc6f9311 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_RemoveNeck.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_RemoveNeck.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import RemoveNeck diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Resample.py b/nipype/interfaces/freesurfer/tests/test_auto_Resample.py index 1633369d13..7e771e10a0 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Resample.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Resample.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Resample diff --git a/nipype/interfaces/freesurfer/tests/test_auto_RobustRegister.py b/nipype/interfaces/freesurfer/tests/test_auto_RobustRegister.py index 0efbe528be..98e7de44c0 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_RobustRegister.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_RobustRegister.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import RobustRegister diff --git a/nipype/interfaces/freesurfer/tests/test_auto_RobustTemplate.py b/nipype/interfaces/freesurfer/tests/test_auto_RobustTemplate.py index 3b5c635a82..d56a11c1b9 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_RobustTemplate.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_RobustTemplate.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..longitudinal import RobustTemplate diff --git a/nipype/interfaces/freesurfer/tests/test_auto_SampleToSurface.py b/nipype/interfaces/freesurfer/tests/test_auto_SampleToSurface.py index f36d84fbfc..44fd5885d2 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_SampleToSurface.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_SampleToSurface.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import SampleToSurface diff --git a/nipype/interfaces/freesurfer/tests/test_auto_SegStats.py b/nipype/interfaces/freesurfer/tests/test_auto_SegStats.py index e9a17b13ea..b330c689e9 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_SegStats.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_SegStats.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import SegStats diff --git a/nipype/interfaces/freesurfer/tests/test_auto_SegStatsReconAll.py b/nipype/interfaces/freesurfer/tests/test_auto_SegStatsReconAll.py index 09da0d001d..11d1972e16 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_SegStatsReconAll.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_SegStatsReconAll.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import SegStatsReconAll diff --git a/nipype/interfaces/freesurfer/tests/test_auto_SegmentCC.py b/nipype/interfaces/freesurfer/tests/test_auto_SegmentCC.py index 8cda53a762..25b1dd4aff 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_SegmentCC.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_SegmentCC.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import SegmentCC diff --git a/nipype/interfaces/freesurfer/tests/test_auto_SegmentWM.py b/nipype/interfaces/freesurfer/tests/test_auto_SegmentWM.py index c86bc926dc..275b710262 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_SegmentWM.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_SegmentWM.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import SegmentWM diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Smooth.py b/nipype/interfaces/freesurfer/tests/test_auto_Smooth.py index 3c52c01430..c6c4109728 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Smooth.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Smooth.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Smooth diff --git a/nipype/interfaces/freesurfer/tests/test_auto_SmoothTessellation.py b/nipype/interfaces/freesurfer/tests/test_auto_SmoothTessellation.py index 1f855c5606..52dbbcf934 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_SmoothTessellation.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_SmoothTessellation.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import SmoothTessellation diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Sphere.py b/nipype/interfaces/freesurfer/tests/test_auto_Sphere.py index a5795653fc..4ec5392c31 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Sphere.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Sphere.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Sphere diff --git a/nipype/interfaces/freesurfer/tests/test_auto_SphericalAverage.py b/nipype/interfaces/freesurfer/tests/test_auto_SphericalAverage.py index 3a38f8c205..6fa42333a5 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_SphericalAverage.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_SphericalAverage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import SphericalAverage diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Surface2VolTransform.py b/nipype/interfaces/freesurfer/tests/test_auto_Surface2VolTransform.py index b291385039..d4fc2c2125 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Surface2VolTransform.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Surface2VolTransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Surface2VolTransform diff --git a/nipype/interfaces/freesurfer/tests/test_auto_SurfaceSmooth.py b/nipype/interfaces/freesurfer/tests/test_auto_SurfaceSmooth.py index c845ae50f7..56dc5ba071 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_SurfaceSmooth.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_SurfaceSmooth.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import SurfaceSmooth diff --git a/nipype/interfaces/freesurfer/tests/test_auto_SurfaceSnapshots.py b/nipype/interfaces/freesurfer/tests/test_auto_SurfaceSnapshots.py index 968041ff67..d3b37cc2b0 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_SurfaceSnapshots.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_SurfaceSnapshots.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import SurfaceSnapshots diff --git a/nipype/interfaces/freesurfer/tests/test_auto_SurfaceTransform.py b/nipype/interfaces/freesurfer/tests/test_auto_SurfaceTransform.py index 5d0dc75073..67ea020def 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_SurfaceTransform.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_SurfaceTransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import SurfaceTransform diff --git a/nipype/interfaces/freesurfer/tests/test_auto_SynthesizeFLASH.py b/nipype/interfaces/freesurfer/tests/test_auto_SynthesizeFLASH.py index a216d35efa..73392602a4 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_SynthesizeFLASH.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_SynthesizeFLASH.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import SynthesizeFLASH diff --git a/nipype/interfaces/freesurfer/tests/test_auto_TalairachAVI.py b/nipype/interfaces/freesurfer/tests/test_auto_TalairachAVI.py index 2a28765d67..e5f6427678 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_TalairachAVI.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_TalairachAVI.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import TalairachAVI diff --git a/nipype/interfaces/freesurfer/tests/test_auto_TalairachQC.py b/nipype/interfaces/freesurfer/tests/test_auto_TalairachQC.py index 1961e3ded6..ecf531879e 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_TalairachQC.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_TalairachQC.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import TalairachQC diff --git a/nipype/interfaces/freesurfer/tests/test_auto_Tkregister2.py b/nipype/interfaces/freesurfer/tests/test_auto_Tkregister2.py index a1b04aab81..3074cc3934 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_Tkregister2.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_Tkregister2.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Tkregister2 diff --git a/nipype/interfaces/freesurfer/tests/test_auto_UnpackSDICOMDir.py b/nipype/interfaces/freesurfer/tests/test_auto_UnpackSDICOMDir.py index 11b1d8c2ce..bd82d0c198 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_UnpackSDICOMDir.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_UnpackSDICOMDir.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import UnpackSDICOMDir diff --git a/nipype/interfaces/freesurfer/tests/test_auto_VolumeMask.py b/nipype/interfaces/freesurfer/tests/test_auto_VolumeMask.py index bfdf5a457e..1a45d4cab3 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_VolumeMask.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_VolumeMask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import VolumeMask diff --git a/nipype/interfaces/freesurfer/tests/test_auto_WatershedSkullStrip.py b/nipype/interfaces/freesurfer/tests/test_auto_WatershedSkullStrip.py index 8112a8f52f..d489d79295 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_WatershedSkullStrip.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_WatershedSkullStrip.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import WatershedSkullStrip diff --git a/nipype/interfaces/freesurfer/tests/test_preprocess.py b/nipype/interfaces/freesurfer/tests/test_preprocess.py index f9fc09515a..b0a6db293a 100644 --- a/nipype/interfaces/freesurfer/tests/test_preprocess.py +++ b/nipype/interfaces/freesurfer/tests/test_preprocess.py @@ -1,7 +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 builtins import str import os import pytest diff --git a/nipype/interfaces/freesurfer/tests/test_utils.py b/nipype/interfaces/freesurfer/tests/test_utils.py index f3ff8fd5ee..203b2483f8 100644 --- a/nipype/interfaces/freesurfer/tests/test_utils.py +++ b/nipype/interfaces/freesurfer/tests/test_utils.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) -from builtins import open import os import os.path as op import pytest diff --git a/nipype/interfaces/freesurfer/utils.py b/nipype/interfaces/freesurfer/utils.py index a60c5f7a11..106938d54d 100644 --- a/nipype/interfaces/freesurfer/utils.py +++ b/nipype/interfaces/freesurfer/utils.py @@ -3,10 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Interfaces to assorted Freesurfer utility programs. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import str, open - import os import re import shutil diff --git a/nipype/interfaces/fsl/aroma.py b/nipype/interfaces/fsl/aroma.py index a86763e3e5..ed0b85df90 100644 --- a/nipype/interfaces/fsl/aroma.py +++ b/nipype/interfaces/fsl/aroma.py @@ -5,8 +5,6 @@ `ICA-AROMA.py`_ command line tool. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) from ..base import (TraitedSpec, CommandLineInputSpec, CommandLine, File, Directory, traits, isdefined) import os diff --git a/nipype/interfaces/fsl/base.py b/nipype/interfaces/fsl/base.py index d16560c824..07ddc4d146 100644 --- a/nipype/interfaces/fsl/base.py +++ b/nipype/interfaces/fsl/base.py @@ -25,8 +25,6 @@ See the docstrings of the individual classes for examples. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) from glob import glob import os diff --git a/nipype/interfaces/fsl/dti.py b/nipype/interfaces/fsl/dti.py index 75cdfeebed..86ee527d5a 100644 --- a/nipype/interfaces/fsl/dti.py +++ b/nipype/interfaces/fsl/dti.py @@ -5,10 +5,6 @@ `_ command line tools. This was written to work with FSL version 4.1.4. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range, open - import os import warnings diff --git a/nipype/interfaces/fsl/epi.py b/nipype/interfaces/fsl/epi.py index a0fdf843da..a3dceb1902 100644 --- a/nipype/interfaces/fsl/epi.py +++ b/nipype/interfaces/fsl/epi.py @@ -5,10 +5,6 @@ `_ command line tools. This was written to work with FSL version 5.0.4. """ -from __future__ import print_function, division, unicode_literals, \ - absolute_import -from builtins import str - import os import numpy as np import nibabel as nb diff --git a/nipype/interfaces/fsl/fix.py b/nipype/interfaces/fsl/fix.py index 5b5a044e88..ab30c5da90 100644 --- a/nipype/interfaces/fsl/fix.py +++ b/nipype/interfaces/fsl/fix.py @@ -54,8 +54,6 @@ outgraph = fix_pipeline.run() """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) from ..base import (TraitedSpec, CommandLineInputSpec, CommandLine, InputMultiPath, OutputMultiPath, BaseInterface, diff --git a/nipype/interfaces/fsl/maths.py b/nipype/interfaces/fsl/maths.py index 3862cea8c7..afa9328205 100644 --- a/nipype/interfaces/fsl/maths.py +++ b/nipype/interfaces/fsl/maths.py @@ -5,8 +5,6 @@ The maths module provides higher-level interfaces to some of the operations that can be performed with the fslmaths command-line program. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os import numpy as np diff --git a/nipype/interfaces/fsl/model.py b/nipype/interfaces/fsl/model.py index ad69968363..5e176ff414 100644 --- a/nipype/interfaces/fsl/model.py +++ b/nipype/interfaces/fsl/model.py @@ -5,10 +5,6 @@ `_ command line tools. This was written to work with FSL version 4.1.4. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range, open - import os from glob import glob from shutil import rmtree diff --git a/nipype/interfaces/fsl/preprocess.py b/nipype/interfaces/fsl/preprocess.py index ce96763d43..9207fbd497 100644 --- a/nipype/interfaces/fsl/preprocess.py +++ b/nipype/interfaces/fsl/preprocess.py @@ -5,10 +5,6 @@ `_ command line tools. This was written to work with FSL version 4.1.4. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range, open - import os import os.path as op from warnings import warn diff --git a/nipype/interfaces/fsl/tests/test_auto_AR1Image.py b/nipype/interfaces/fsl/tests/test_auto_AR1Image.py index 260f53b978..e631c31d70 100644 --- a/nipype/interfaces/fsl/tests/test_auto_AR1Image.py +++ b/nipype/interfaces/fsl/tests/test_auto_AR1Image.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import AR1Image diff --git a/nipype/interfaces/fsl/tests/test_auto_AccuracyTester.py b/nipype/interfaces/fsl/tests/test_auto_AccuracyTester.py index ffd5b42bd1..bc1e962fa1 100644 --- a/nipype/interfaces/fsl/tests/test_auto_AccuracyTester.py +++ b/nipype/interfaces/fsl/tests/test_auto_AccuracyTester.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..fix import AccuracyTester diff --git a/nipype/interfaces/fsl/tests/test_auto_ApplyMask.py b/nipype/interfaces/fsl/tests/test_auto_ApplyMask.py index ad8df118b6..dfc98c5a02 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ApplyMask.py +++ b/nipype/interfaces/fsl/tests/test_auto_ApplyMask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import ApplyMask diff --git a/nipype/interfaces/fsl/tests/test_auto_ApplyTOPUP.py b/nipype/interfaces/fsl/tests/test_auto_ApplyTOPUP.py index 805884f23c..0af0b43b0a 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ApplyTOPUP.py +++ b/nipype/interfaces/fsl/tests/test_auto_ApplyTOPUP.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..epi import ApplyTOPUP diff --git a/nipype/interfaces/fsl/tests/test_auto_ApplyWarp.py b/nipype/interfaces/fsl/tests/test_auto_ApplyWarp.py index 2af381012b..a6d924e825 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ApplyWarp.py +++ b/nipype/interfaces/fsl/tests/test_auto_ApplyWarp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import ApplyWarp diff --git a/nipype/interfaces/fsl/tests/test_auto_ApplyXFM.py b/nipype/interfaces/fsl/tests/test_auto_ApplyXFM.py index 38a45ce775..b7264213b9 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ApplyXFM.py +++ b/nipype/interfaces/fsl/tests/test_auto_ApplyXFM.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import ApplyXFM diff --git a/nipype/interfaces/fsl/tests/test_auto_AvScale.py b/nipype/interfaces/fsl/tests/test_auto_AvScale.py index a6df228f71..0b803fd558 100644 --- a/nipype/interfaces/fsl/tests/test_auto_AvScale.py +++ b/nipype/interfaces/fsl/tests/test_auto_AvScale.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import AvScale diff --git a/nipype/interfaces/fsl/tests/test_auto_B0Calc.py b/nipype/interfaces/fsl/tests/test_auto_B0Calc.py index 1127f900d1..532780c8cb 100644 --- a/nipype/interfaces/fsl/tests/test_auto_B0Calc.py +++ b/nipype/interfaces/fsl/tests/test_auto_B0Calc.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..possum import B0Calc diff --git a/nipype/interfaces/fsl/tests/test_auto_BEDPOSTX5.py b/nipype/interfaces/fsl/tests/test_auto_BEDPOSTX5.py index e93cf42b9d..54cbcf0410 100644 --- a/nipype/interfaces/fsl/tests/test_auto_BEDPOSTX5.py +++ b/nipype/interfaces/fsl/tests/test_auto_BEDPOSTX5.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import BEDPOSTX5 diff --git a/nipype/interfaces/fsl/tests/test_auto_BET.py b/nipype/interfaces/fsl/tests/test_auto_BET.py index ea155c249b..33968d9ac9 100644 --- a/nipype/interfaces/fsl/tests/test_auto_BET.py +++ b/nipype/interfaces/fsl/tests/test_auto_BET.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import BET diff --git a/nipype/interfaces/fsl/tests/test_auto_BinaryMaths.py b/nipype/interfaces/fsl/tests/test_auto_BinaryMaths.py index 8020c49bbc..055f37e35f 100644 --- a/nipype/interfaces/fsl/tests/test_auto_BinaryMaths.py +++ b/nipype/interfaces/fsl/tests/test_auto_BinaryMaths.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import BinaryMaths diff --git a/nipype/interfaces/fsl/tests/test_auto_ChangeDataType.py b/nipype/interfaces/fsl/tests/test_auto_ChangeDataType.py index 665a2cb47d..a4428446e7 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ChangeDataType.py +++ b/nipype/interfaces/fsl/tests/test_auto_ChangeDataType.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import ChangeDataType diff --git a/nipype/interfaces/fsl/tests/test_auto_Classifier.py b/nipype/interfaces/fsl/tests/test_auto_Classifier.py index b477b38ea4..dbd0f129a2 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Classifier.py +++ b/nipype/interfaces/fsl/tests/test_auto_Classifier.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..fix import Classifier diff --git a/nipype/interfaces/fsl/tests/test_auto_Cleaner.py b/nipype/interfaces/fsl/tests/test_auto_Cleaner.py index 597dc88d5e..8e587fde99 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Cleaner.py +++ b/nipype/interfaces/fsl/tests/test_auto_Cleaner.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..fix import Cleaner diff --git a/nipype/interfaces/fsl/tests/test_auto_Cluster.py b/nipype/interfaces/fsl/tests/test_auto_Cluster.py index 19340b9383..10d8af2706 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Cluster.py +++ b/nipype/interfaces/fsl/tests/test_auto_Cluster.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import Cluster diff --git a/nipype/interfaces/fsl/tests/test_auto_Complex.py b/nipype/interfaces/fsl/tests/test_auto_Complex.py index 09f2add2bc..2f068e7a1d 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Complex.py +++ b/nipype/interfaces/fsl/tests/test_auto_Complex.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Complex diff --git a/nipype/interfaces/fsl/tests/test_auto_ContrastMgr.py b/nipype/interfaces/fsl/tests/test_auto_ContrastMgr.py index 7f4c0f5367..0a58eac8e3 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ContrastMgr.py +++ b/nipype/interfaces/fsl/tests/test_auto_ContrastMgr.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import ContrastMgr diff --git a/nipype/interfaces/fsl/tests/test_auto_ConvertWarp.py b/nipype/interfaces/fsl/tests/test_auto_ConvertWarp.py index 602ca86b47..5b321f761f 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ConvertWarp.py +++ b/nipype/interfaces/fsl/tests/test_auto_ConvertWarp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ConvertWarp diff --git a/nipype/interfaces/fsl/tests/test_auto_ConvertXFM.py b/nipype/interfaces/fsl/tests/test_auto_ConvertXFM.py index a49a846ad9..f4bf1b24f9 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ConvertXFM.py +++ b/nipype/interfaces/fsl/tests/test_auto_ConvertXFM.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ConvertXFM diff --git a/nipype/interfaces/fsl/tests/test_auto_CopyGeom.py b/nipype/interfaces/fsl/tests/test_auto_CopyGeom.py index 2cf330edee..9a402237cd 100644 --- a/nipype/interfaces/fsl/tests/test_auto_CopyGeom.py +++ b/nipype/interfaces/fsl/tests/test_auto_CopyGeom.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import CopyGeom diff --git a/nipype/interfaces/fsl/tests/test_auto_DTIFit.py b/nipype/interfaces/fsl/tests/test_auto_DTIFit.py index b88fc68c82..83dfc512b6 100644 --- a/nipype/interfaces/fsl/tests/test_auto_DTIFit.py +++ b/nipype/interfaces/fsl/tests/test_auto_DTIFit.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import DTIFit diff --git a/nipype/interfaces/fsl/tests/test_auto_DilateImage.py b/nipype/interfaces/fsl/tests/test_auto_DilateImage.py index 12df7f13af..0bd0fbd869 100644 --- a/nipype/interfaces/fsl/tests/test_auto_DilateImage.py +++ b/nipype/interfaces/fsl/tests/test_auto_DilateImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import DilateImage diff --git a/nipype/interfaces/fsl/tests/test_auto_DistanceMap.py b/nipype/interfaces/fsl/tests/test_auto_DistanceMap.py index 88f53ad2eb..6e67f07c4d 100644 --- a/nipype/interfaces/fsl/tests/test_auto_DistanceMap.py +++ b/nipype/interfaces/fsl/tests/test_auto_DistanceMap.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import DistanceMap diff --git a/nipype/interfaces/fsl/tests/test_auto_DualRegression.py b/nipype/interfaces/fsl/tests/test_auto_DualRegression.py index 99556ae8fa..2a9477da6c 100644 --- a/nipype/interfaces/fsl/tests/test_auto_DualRegression.py +++ b/nipype/interfaces/fsl/tests/test_auto_DualRegression.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import DualRegression diff --git a/nipype/interfaces/fsl/tests/test_auto_EPIDeWarp.py b/nipype/interfaces/fsl/tests/test_auto_EPIDeWarp.py index fa5fbcf041..3f5396ea8e 100644 --- a/nipype/interfaces/fsl/tests/test_auto_EPIDeWarp.py +++ b/nipype/interfaces/fsl/tests/test_auto_EPIDeWarp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..epi import EPIDeWarp diff --git a/nipype/interfaces/fsl/tests/test_auto_Eddy.py b/nipype/interfaces/fsl/tests/test_auto_Eddy.py index 4bd6a3e840..065fbb1889 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Eddy.py +++ b/nipype/interfaces/fsl/tests/test_auto_Eddy.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..epi import Eddy diff --git a/nipype/interfaces/fsl/tests/test_auto_EddyCorrect.py b/nipype/interfaces/fsl/tests/test_auto_EddyCorrect.py index 86134137ac..f1d5113661 100644 --- a/nipype/interfaces/fsl/tests/test_auto_EddyCorrect.py +++ b/nipype/interfaces/fsl/tests/test_auto_EddyCorrect.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..epi import EddyCorrect diff --git a/nipype/interfaces/fsl/tests/test_auto_EddyQuad.py b/nipype/interfaces/fsl/tests/test_auto_EddyQuad.py index 945b2e54ba..edfe407ae4 100644 --- a/nipype/interfaces/fsl/tests/test_auto_EddyQuad.py +++ b/nipype/interfaces/fsl/tests/test_auto_EddyQuad.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..epi import EddyQuad diff --git a/nipype/interfaces/fsl/tests/test_auto_EpiReg.py b/nipype/interfaces/fsl/tests/test_auto_EpiReg.py index a6b06e0ca7..8f7cadfbb5 100644 --- a/nipype/interfaces/fsl/tests/test_auto_EpiReg.py +++ b/nipype/interfaces/fsl/tests/test_auto_EpiReg.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..epi import EpiReg diff --git a/nipype/interfaces/fsl/tests/test_auto_ErodeImage.py b/nipype/interfaces/fsl/tests/test_auto_ErodeImage.py index bd7d6f2b83..09612d176a 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ErodeImage.py +++ b/nipype/interfaces/fsl/tests/test_auto_ErodeImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import ErodeImage diff --git a/nipype/interfaces/fsl/tests/test_auto_ExtractROI.py b/nipype/interfaces/fsl/tests/test_auto_ExtractROI.py index 414a068177..04bcc217bc 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ExtractROI.py +++ b/nipype/interfaces/fsl/tests/test_auto_ExtractROI.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ExtractROI diff --git a/nipype/interfaces/fsl/tests/test_auto_FAST.py b/nipype/interfaces/fsl/tests/test_auto_FAST.py index b36c941cff..aae90cd3a3 100644 --- a/nipype/interfaces/fsl/tests/test_auto_FAST.py +++ b/nipype/interfaces/fsl/tests/test_auto_FAST.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import FAST diff --git a/nipype/interfaces/fsl/tests/test_auto_FEAT.py b/nipype/interfaces/fsl/tests/test_auto_FEAT.py index e193a0ae27..3b86062923 100644 --- a/nipype/interfaces/fsl/tests/test_auto_FEAT.py +++ b/nipype/interfaces/fsl/tests/test_auto_FEAT.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import FEAT diff --git a/nipype/interfaces/fsl/tests/test_auto_FEATModel.py b/nipype/interfaces/fsl/tests/test_auto_FEATModel.py index b1103396d8..7f1b98c8c4 100644 --- a/nipype/interfaces/fsl/tests/test_auto_FEATModel.py +++ b/nipype/interfaces/fsl/tests/test_auto_FEATModel.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import FEATModel diff --git a/nipype/interfaces/fsl/tests/test_auto_FEATRegister.py b/nipype/interfaces/fsl/tests/test_auto_FEATRegister.py index d0d008956f..56a3e2ba01 100644 --- a/nipype/interfaces/fsl/tests/test_auto_FEATRegister.py +++ b/nipype/interfaces/fsl/tests/test_auto_FEATRegister.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import FEATRegister diff --git a/nipype/interfaces/fsl/tests/test_auto_FIRST.py b/nipype/interfaces/fsl/tests/test_auto_FIRST.py index fc7914a828..4b9cb5928b 100644 --- a/nipype/interfaces/fsl/tests/test_auto_FIRST.py +++ b/nipype/interfaces/fsl/tests/test_auto_FIRST.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import FIRST diff --git a/nipype/interfaces/fsl/tests/test_auto_FLAMEO.py b/nipype/interfaces/fsl/tests/test_auto_FLAMEO.py index 5de114a4c3..e3dfb7f933 100644 --- a/nipype/interfaces/fsl/tests/test_auto_FLAMEO.py +++ b/nipype/interfaces/fsl/tests/test_auto_FLAMEO.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import FLAMEO diff --git a/nipype/interfaces/fsl/tests/test_auto_FLIRT.py b/nipype/interfaces/fsl/tests/test_auto_FLIRT.py index 08074ccf94..88cb684c01 100644 --- a/nipype/interfaces/fsl/tests/test_auto_FLIRT.py +++ b/nipype/interfaces/fsl/tests/test_auto_FLIRT.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import FLIRT diff --git a/nipype/interfaces/fsl/tests/test_auto_FNIRT.py b/nipype/interfaces/fsl/tests/test_auto_FNIRT.py index 95afc3aa4d..c54a2d2955 100644 --- a/nipype/interfaces/fsl/tests/test_auto_FNIRT.py +++ b/nipype/interfaces/fsl/tests/test_auto_FNIRT.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import FNIRT diff --git a/nipype/interfaces/fsl/tests/test_auto_FSLCommand.py b/nipype/interfaces/fsl/tests/test_auto_FSLCommand.py index 1d95b77df5..5398e4532d 100644 --- a/nipype/interfaces/fsl/tests/test_auto_FSLCommand.py +++ b/nipype/interfaces/fsl/tests/test_auto_FSLCommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import FSLCommand diff --git a/nipype/interfaces/fsl/tests/test_auto_FSLXCommand.py b/nipype/interfaces/fsl/tests/test_auto_FSLXCommand.py index e0ecf18807..4ca61eebf1 100644 --- a/nipype/interfaces/fsl/tests/test_auto_FSLXCommand.py +++ b/nipype/interfaces/fsl/tests/test_auto_FSLXCommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import FSLXCommand diff --git a/nipype/interfaces/fsl/tests/test_auto_FUGUE.py b/nipype/interfaces/fsl/tests/test_auto_FUGUE.py index 5862d2e901..d1fcb85640 100644 --- a/nipype/interfaces/fsl/tests/test_auto_FUGUE.py +++ b/nipype/interfaces/fsl/tests/test_auto_FUGUE.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import FUGUE diff --git a/nipype/interfaces/fsl/tests/test_auto_FeatureExtractor.py b/nipype/interfaces/fsl/tests/test_auto_FeatureExtractor.py index eaeeb34ce8..20fc8061f3 100644 --- a/nipype/interfaces/fsl/tests/test_auto_FeatureExtractor.py +++ b/nipype/interfaces/fsl/tests/test_auto_FeatureExtractor.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..fix import FeatureExtractor diff --git a/nipype/interfaces/fsl/tests/test_auto_FilterRegressor.py b/nipype/interfaces/fsl/tests/test_auto_FilterRegressor.py index 3e7dcc2c41..47470f5209 100644 --- a/nipype/interfaces/fsl/tests/test_auto_FilterRegressor.py +++ b/nipype/interfaces/fsl/tests/test_auto_FilterRegressor.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import FilterRegressor diff --git a/nipype/interfaces/fsl/tests/test_auto_FindTheBiggest.py b/nipype/interfaces/fsl/tests/test_auto_FindTheBiggest.py index a8262c9be1..a6ed3974e1 100644 --- a/nipype/interfaces/fsl/tests/test_auto_FindTheBiggest.py +++ b/nipype/interfaces/fsl/tests/test_auto_FindTheBiggest.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import FindTheBiggest diff --git a/nipype/interfaces/fsl/tests/test_auto_GLM.py b/nipype/interfaces/fsl/tests/test_auto_GLM.py index eb6f49f554..887e5fcee5 100644 --- a/nipype/interfaces/fsl/tests/test_auto_GLM.py +++ b/nipype/interfaces/fsl/tests/test_auto_GLM.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import GLM diff --git a/nipype/interfaces/fsl/tests/test_auto_ICA_AROMA.py b/nipype/interfaces/fsl/tests/test_auto_ICA_AROMA.py index c3f10c2664..cb55f36e28 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ICA_AROMA.py +++ b/nipype/interfaces/fsl/tests/test_auto_ICA_AROMA.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..aroma import ICA_AROMA diff --git a/nipype/interfaces/fsl/tests/test_auto_ImageMaths.py b/nipype/interfaces/fsl/tests/test_auto_ImageMaths.py index d25ed8bc77..9c3c254fea 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ImageMaths.py +++ b/nipype/interfaces/fsl/tests/test_auto_ImageMaths.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ImageMaths diff --git a/nipype/interfaces/fsl/tests/test_auto_ImageMeants.py b/nipype/interfaces/fsl/tests/test_auto_ImageMeants.py index 5c83c40150..2565d8536d 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ImageMeants.py +++ b/nipype/interfaces/fsl/tests/test_auto_ImageMeants.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ImageMeants diff --git a/nipype/interfaces/fsl/tests/test_auto_ImageStats.py b/nipype/interfaces/fsl/tests/test_auto_ImageStats.py index f2dc0af947..f1ad146797 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ImageStats.py +++ b/nipype/interfaces/fsl/tests/test_auto_ImageStats.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ImageStats diff --git a/nipype/interfaces/fsl/tests/test_auto_InvWarp.py b/nipype/interfaces/fsl/tests/test_auto_InvWarp.py index fa39ceac7d..b78ede0ec4 100644 --- a/nipype/interfaces/fsl/tests/test_auto_InvWarp.py +++ b/nipype/interfaces/fsl/tests/test_auto_InvWarp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import InvWarp diff --git a/nipype/interfaces/fsl/tests/test_auto_IsotropicSmooth.py b/nipype/interfaces/fsl/tests/test_auto_IsotropicSmooth.py index 5c224aeeb6..5cad38954b 100644 --- a/nipype/interfaces/fsl/tests/test_auto_IsotropicSmooth.py +++ b/nipype/interfaces/fsl/tests/test_auto_IsotropicSmooth.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import IsotropicSmooth diff --git a/nipype/interfaces/fsl/tests/test_auto_L2Model.py b/nipype/interfaces/fsl/tests/test_auto_L2Model.py index 160fba2fb5..aad29206e2 100644 --- a/nipype/interfaces/fsl/tests/test_auto_L2Model.py +++ b/nipype/interfaces/fsl/tests/test_auto_L2Model.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import L2Model diff --git a/nipype/interfaces/fsl/tests/test_auto_Level1Design.py b/nipype/interfaces/fsl/tests/test_auto_Level1Design.py index 45451f8eff..8b1c076ac6 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Level1Design.py +++ b/nipype/interfaces/fsl/tests/test_auto_Level1Design.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import Level1Design diff --git a/nipype/interfaces/fsl/tests/test_auto_MCFLIRT.py b/nipype/interfaces/fsl/tests/test_auto_MCFLIRT.py index f9f1868613..84cf5cdc98 100644 --- a/nipype/interfaces/fsl/tests/test_auto_MCFLIRT.py +++ b/nipype/interfaces/fsl/tests/test_auto_MCFLIRT.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import MCFLIRT diff --git a/nipype/interfaces/fsl/tests/test_auto_MELODIC.py b/nipype/interfaces/fsl/tests/test_auto_MELODIC.py index b024a9f572..2c0aeab9f1 100644 --- a/nipype/interfaces/fsl/tests/test_auto_MELODIC.py +++ b/nipype/interfaces/fsl/tests/test_auto_MELODIC.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import MELODIC diff --git a/nipype/interfaces/fsl/tests/test_auto_MakeDyadicVectors.py b/nipype/interfaces/fsl/tests/test_auto_MakeDyadicVectors.py index 832946a499..05611f4b80 100644 --- a/nipype/interfaces/fsl/tests/test_auto_MakeDyadicVectors.py +++ b/nipype/interfaces/fsl/tests/test_auto_MakeDyadicVectors.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import MakeDyadicVectors diff --git a/nipype/interfaces/fsl/tests/test_auto_MathsCommand.py b/nipype/interfaces/fsl/tests/test_auto_MathsCommand.py index 061bb66e99..ff7ae2090b 100644 --- a/nipype/interfaces/fsl/tests/test_auto_MathsCommand.py +++ b/nipype/interfaces/fsl/tests/test_auto_MathsCommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import MathsCommand diff --git a/nipype/interfaces/fsl/tests/test_auto_MaxImage.py b/nipype/interfaces/fsl/tests/test_auto_MaxImage.py index 608a886199..03fbb31d6e 100644 --- a/nipype/interfaces/fsl/tests/test_auto_MaxImage.py +++ b/nipype/interfaces/fsl/tests/test_auto_MaxImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import MaxImage diff --git a/nipype/interfaces/fsl/tests/test_auto_MaxnImage.py b/nipype/interfaces/fsl/tests/test_auto_MaxnImage.py index fb6da29ee6..a53b285396 100644 --- a/nipype/interfaces/fsl/tests/test_auto_MaxnImage.py +++ b/nipype/interfaces/fsl/tests/test_auto_MaxnImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import MaxnImage diff --git a/nipype/interfaces/fsl/tests/test_auto_MeanImage.py b/nipype/interfaces/fsl/tests/test_auto_MeanImage.py index 745be40f92..ad2c6633ef 100644 --- a/nipype/interfaces/fsl/tests/test_auto_MeanImage.py +++ b/nipype/interfaces/fsl/tests/test_auto_MeanImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import MeanImage diff --git a/nipype/interfaces/fsl/tests/test_auto_MedianImage.py b/nipype/interfaces/fsl/tests/test_auto_MedianImage.py index e777ffbc34..38b06c61eb 100644 --- a/nipype/interfaces/fsl/tests/test_auto_MedianImage.py +++ b/nipype/interfaces/fsl/tests/test_auto_MedianImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import MedianImage diff --git a/nipype/interfaces/fsl/tests/test_auto_Merge.py b/nipype/interfaces/fsl/tests/test_auto_Merge.py index d6176eb92e..04cb5eea2c 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Merge.py +++ b/nipype/interfaces/fsl/tests/test_auto_Merge.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Merge diff --git a/nipype/interfaces/fsl/tests/test_auto_MinImage.py b/nipype/interfaces/fsl/tests/test_auto_MinImage.py index 88561bbe78..e16d5f2a26 100644 --- a/nipype/interfaces/fsl/tests/test_auto_MinImage.py +++ b/nipype/interfaces/fsl/tests/test_auto_MinImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import MinImage diff --git a/nipype/interfaces/fsl/tests/test_auto_MotionOutliers.py b/nipype/interfaces/fsl/tests/test_auto_MotionOutliers.py index 1c199ca83f..8ef7c61cb1 100644 --- a/nipype/interfaces/fsl/tests/test_auto_MotionOutliers.py +++ b/nipype/interfaces/fsl/tests/test_auto_MotionOutliers.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MotionOutliers diff --git a/nipype/interfaces/fsl/tests/test_auto_MultiImageMaths.py b/nipype/interfaces/fsl/tests/test_auto_MultiImageMaths.py index edeb802c1c..a6963467a6 100644 --- a/nipype/interfaces/fsl/tests/test_auto_MultiImageMaths.py +++ b/nipype/interfaces/fsl/tests/test_auto_MultiImageMaths.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import MultiImageMaths diff --git a/nipype/interfaces/fsl/tests/test_auto_MultipleRegressDesign.py b/nipype/interfaces/fsl/tests/test_auto_MultipleRegressDesign.py index 05c67e6d94..17b692f5ac 100644 --- a/nipype/interfaces/fsl/tests/test_auto_MultipleRegressDesign.py +++ b/nipype/interfaces/fsl/tests/test_auto_MultipleRegressDesign.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import MultipleRegressDesign diff --git a/nipype/interfaces/fsl/tests/test_auto_Overlay.py b/nipype/interfaces/fsl/tests/test_auto_Overlay.py index de4024c36d..8a2dad8690 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Overlay.py +++ b/nipype/interfaces/fsl/tests/test_auto_Overlay.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Overlay diff --git a/nipype/interfaces/fsl/tests/test_auto_PRELUDE.py b/nipype/interfaces/fsl/tests/test_auto_PRELUDE.py index c160745dd5..cc5cdad018 100644 --- a/nipype/interfaces/fsl/tests/test_auto_PRELUDE.py +++ b/nipype/interfaces/fsl/tests/test_auto_PRELUDE.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import PRELUDE diff --git a/nipype/interfaces/fsl/tests/test_auto_PercentileImage.py b/nipype/interfaces/fsl/tests/test_auto_PercentileImage.py index 7a27272e67..6e186c9d44 100644 --- a/nipype/interfaces/fsl/tests/test_auto_PercentileImage.py +++ b/nipype/interfaces/fsl/tests/test_auto_PercentileImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import PercentileImage diff --git a/nipype/interfaces/fsl/tests/test_auto_PlotMotionParams.py b/nipype/interfaces/fsl/tests/test_auto_PlotMotionParams.py index d88374f105..c548766a71 100644 --- a/nipype/interfaces/fsl/tests/test_auto_PlotMotionParams.py +++ b/nipype/interfaces/fsl/tests/test_auto_PlotMotionParams.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import PlotMotionParams diff --git a/nipype/interfaces/fsl/tests/test_auto_PlotTimeSeries.py b/nipype/interfaces/fsl/tests/test_auto_PlotTimeSeries.py index d923f16b6b..8d51e1dd5a 100644 --- a/nipype/interfaces/fsl/tests/test_auto_PlotTimeSeries.py +++ b/nipype/interfaces/fsl/tests/test_auto_PlotTimeSeries.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import PlotTimeSeries diff --git a/nipype/interfaces/fsl/tests/test_auto_PowerSpectrum.py b/nipype/interfaces/fsl/tests/test_auto_PowerSpectrum.py index 15e6adc101..df30704138 100644 --- a/nipype/interfaces/fsl/tests/test_auto_PowerSpectrum.py +++ b/nipype/interfaces/fsl/tests/test_auto_PowerSpectrum.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import PowerSpectrum diff --git a/nipype/interfaces/fsl/tests/test_auto_PrepareFieldmap.py b/nipype/interfaces/fsl/tests/test_auto_PrepareFieldmap.py index d3515701b1..cf2b9c41b0 100644 --- a/nipype/interfaces/fsl/tests/test_auto_PrepareFieldmap.py +++ b/nipype/interfaces/fsl/tests/test_auto_PrepareFieldmap.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..epi import PrepareFieldmap diff --git a/nipype/interfaces/fsl/tests/test_auto_ProbTrackX.py b/nipype/interfaces/fsl/tests/test_auto_ProbTrackX.py index 689b8c755d..b7eacdaa01 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ProbTrackX.py +++ b/nipype/interfaces/fsl/tests/test_auto_ProbTrackX.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import ProbTrackX diff --git a/nipype/interfaces/fsl/tests/test_auto_ProbTrackX2.py b/nipype/interfaces/fsl/tests/test_auto_ProbTrackX2.py index 8ddf5f3a9a..3e1a6c12c3 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ProbTrackX2.py +++ b/nipype/interfaces/fsl/tests/test_auto_ProbTrackX2.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import ProbTrackX2 diff --git a/nipype/interfaces/fsl/tests/test_auto_ProjThresh.py b/nipype/interfaces/fsl/tests/test_auto_ProjThresh.py index dc3878e2c0..304beace0d 100644 --- a/nipype/interfaces/fsl/tests/test_auto_ProjThresh.py +++ b/nipype/interfaces/fsl/tests/test_auto_ProjThresh.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import ProjThresh diff --git a/nipype/interfaces/fsl/tests/test_auto_Randomise.py b/nipype/interfaces/fsl/tests/test_auto_Randomise.py index 21a9142639..4b6194a3d8 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Randomise.py +++ b/nipype/interfaces/fsl/tests/test_auto_Randomise.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import Randomise diff --git a/nipype/interfaces/fsl/tests/test_auto_Reorient2Std.py b/nipype/interfaces/fsl/tests/test_auto_Reorient2Std.py index aeced99424..e3843be681 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Reorient2Std.py +++ b/nipype/interfaces/fsl/tests/test_auto_Reorient2Std.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Reorient2Std diff --git a/nipype/interfaces/fsl/tests/test_auto_RobustFOV.py b/nipype/interfaces/fsl/tests/test_auto_RobustFOV.py index d7adfa8ca2..3e0ce74dd3 100644 --- a/nipype/interfaces/fsl/tests/test_auto_RobustFOV.py +++ b/nipype/interfaces/fsl/tests/test_auto_RobustFOV.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import RobustFOV diff --git a/nipype/interfaces/fsl/tests/test_auto_SMM.py b/nipype/interfaces/fsl/tests/test_auto_SMM.py index f42eb5189a..9d3591ae27 100644 --- a/nipype/interfaces/fsl/tests/test_auto_SMM.py +++ b/nipype/interfaces/fsl/tests/test_auto_SMM.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import SMM diff --git a/nipype/interfaces/fsl/tests/test_auto_SUSAN.py b/nipype/interfaces/fsl/tests/test_auto_SUSAN.py index 69616b77ac..44b19350be 100644 --- a/nipype/interfaces/fsl/tests/test_auto_SUSAN.py +++ b/nipype/interfaces/fsl/tests/test_auto_SUSAN.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import SUSAN diff --git a/nipype/interfaces/fsl/tests/test_auto_SigLoss.py b/nipype/interfaces/fsl/tests/test_auto_SigLoss.py index dc2b91a47f..193557d297 100644 --- a/nipype/interfaces/fsl/tests/test_auto_SigLoss.py +++ b/nipype/interfaces/fsl/tests/test_auto_SigLoss.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import SigLoss diff --git a/nipype/interfaces/fsl/tests/test_auto_Slice.py b/nipype/interfaces/fsl/tests/test_auto_Slice.py index d6202b6514..a3e604b657 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Slice.py +++ b/nipype/interfaces/fsl/tests/test_auto_Slice.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Slice diff --git a/nipype/interfaces/fsl/tests/test_auto_SliceTimer.py b/nipype/interfaces/fsl/tests/test_auto_SliceTimer.py index 71915c8da9..9e26d7952b 100644 --- a/nipype/interfaces/fsl/tests/test_auto_SliceTimer.py +++ b/nipype/interfaces/fsl/tests/test_auto_SliceTimer.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import SliceTimer diff --git a/nipype/interfaces/fsl/tests/test_auto_Slicer.py b/nipype/interfaces/fsl/tests/test_auto_Slicer.py index 14ad2d375e..d843870561 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Slicer.py +++ b/nipype/interfaces/fsl/tests/test_auto_Slicer.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Slicer diff --git a/nipype/interfaces/fsl/tests/test_auto_Smooth.py b/nipype/interfaces/fsl/tests/test_auto_Smooth.py index a08bd946a0..bc710d76a5 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Smooth.py +++ b/nipype/interfaces/fsl/tests/test_auto_Smooth.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Smooth diff --git a/nipype/interfaces/fsl/tests/test_auto_SmoothEstimate.py b/nipype/interfaces/fsl/tests/test_auto_SmoothEstimate.py index 21c1f13b62..811bc1e4b9 100644 --- a/nipype/interfaces/fsl/tests/test_auto_SmoothEstimate.py +++ b/nipype/interfaces/fsl/tests/test_auto_SmoothEstimate.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import SmoothEstimate diff --git a/nipype/interfaces/fsl/tests/test_auto_SpatialFilter.py b/nipype/interfaces/fsl/tests/test_auto_SpatialFilter.py index 3ef493d752..2f267eb6bf 100644 --- a/nipype/interfaces/fsl/tests/test_auto_SpatialFilter.py +++ b/nipype/interfaces/fsl/tests/test_auto_SpatialFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import SpatialFilter diff --git a/nipype/interfaces/fsl/tests/test_auto_Split.py b/nipype/interfaces/fsl/tests/test_auto_Split.py index fed820ebbe..2c922ad583 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Split.py +++ b/nipype/interfaces/fsl/tests/test_auto_Split.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Split diff --git a/nipype/interfaces/fsl/tests/test_auto_StdImage.py b/nipype/interfaces/fsl/tests/test_auto_StdImage.py index 134d5d0d16..a8b7e764b5 100644 --- a/nipype/interfaces/fsl/tests/test_auto_StdImage.py +++ b/nipype/interfaces/fsl/tests/test_auto_StdImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import StdImage diff --git a/nipype/interfaces/fsl/tests/test_auto_SwapDimensions.py b/nipype/interfaces/fsl/tests/test_auto_SwapDimensions.py index 78aca77b26..241cfbcf27 100644 --- a/nipype/interfaces/fsl/tests/test_auto_SwapDimensions.py +++ b/nipype/interfaces/fsl/tests/test_auto_SwapDimensions.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import SwapDimensions diff --git a/nipype/interfaces/fsl/tests/test_auto_TOPUP.py b/nipype/interfaces/fsl/tests/test_auto_TOPUP.py index ef3fed494c..f98dbef518 100644 --- a/nipype/interfaces/fsl/tests/test_auto_TOPUP.py +++ b/nipype/interfaces/fsl/tests/test_auto_TOPUP.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..epi import TOPUP diff --git a/nipype/interfaces/fsl/tests/test_auto_TemporalFilter.py b/nipype/interfaces/fsl/tests/test_auto_TemporalFilter.py index 61145ebc1a..9f4ecfbd1a 100644 --- a/nipype/interfaces/fsl/tests/test_auto_TemporalFilter.py +++ b/nipype/interfaces/fsl/tests/test_auto_TemporalFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import TemporalFilter diff --git a/nipype/interfaces/fsl/tests/test_auto_Threshold.py b/nipype/interfaces/fsl/tests/test_auto_Threshold.py index e09faaa6ea..0b1eaeaa17 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Threshold.py +++ b/nipype/interfaces/fsl/tests/test_auto_Threshold.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import Threshold diff --git a/nipype/interfaces/fsl/tests/test_auto_TractSkeleton.py b/nipype/interfaces/fsl/tests/test_auto_TractSkeleton.py index b46c9d8839..e630e10a40 100644 --- a/nipype/interfaces/fsl/tests/test_auto_TractSkeleton.py +++ b/nipype/interfaces/fsl/tests/test_auto_TractSkeleton.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import TractSkeleton diff --git a/nipype/interfaces/fsl/tests/test_auto_Training.py b/nipype/interfaces/fsl/tests/test_auto_Training.py index 1917419503..51617d97ed 100644 --- a/nipype/interfaces/fsl/tests/test_auto_Training.py +++ b/nipype/interfaces/fsl/tests/test_auto_Training.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..fix import Training diff --git a/nipype/interfaces/fsl/tests/test_auto_TrainingSetCreator.py b/nipype/interfaces/fsl/tests/test_auto_TrainingSetCreator.py index 638bcdd156..edde69fc32 100644 --- a/nipype/interfaces/fsl/tests/test_auto_TrainingSetCreator.py +++ b/nipype/interfaces/fsl/tests/test_auto_TrainingSetCreator.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..fix import TrainingSetCreator diff --git a/nipype/interfaces/fsl/tests/test_auto_UnaryMaths.py b/nipype/interfaces/fsl/tests/test_auto_UnaryMaths.py index c92f00eb3b..20fde2afca 100644 --- a/nipype/interfaces/fsl/tests/test_auto_UnaryMaths.py +++ b/nipype/interfaces/fsl/tests/test_auto_UnaryMaths.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import UnaryMaths diff --git a/nipype/interfaces/fsl/tests/test_auto_VecReg.py b/nipype/interfaces/fsl/tests/test_auto_VecReg.py index 18e7b03dad..41c74d2eb2 100644 --- a/nipype/interfaces/fsl/tests/test_auto_VecReg.py +++ b/nipype/interfaces/fsl/tests/test_auto_VecReg.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import VecReg diff --git a/nipype/interfaces/fsl/tests/test_auto_WarpPoints.py b/nipype/interfaces/fsl/tests/test_auto_WarpPoints.py index d3473c31a5..541cff38aa 100644 --- a/nipype/interfaces/fsl/tests/test_auto_WarpPoints.py +++ b/nipype/interfaces/fsl/tests/test_auto_WarpPoints.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import WarpPoints diff --git a/nipype/interfaces/fsl/tests/test_auto_WarpPointsFromStd.py b/nipype/interfaces/fsl/tests/test_auto_WarpPointsFromStd.py index e1afc49d9d..369794e3c0 100644 --- a/nipype/interfaces/fsl/tests/test_auto_WarpPointsFromStd.py +++ b/nipype/interfaces/fsl/tests/test_auto_WarpPointsFromStd.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import WarpPointsFromStd diff --git a/nipype/interfaces/fsl/tests/test_auto_WarpPointsToStd.py b/nipype/interfaces/fsl/tests/test_auto_WarpPointsToStd.py index 245c587b2e..9c62aa6ec7 100644 --- a/nipype/interfaces/fsl/tests/test_auto_WarpPointsToStd.py +++ b/nipype/interfaces/fsl/tests/test_auto_WarpPointsToStd.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import WarpPointsToStd diff --git a/nipype/interfaces/fsl/tests/test_auto_WarpUtils.py b/nipype/interfaces/fsl/tests/test_auto_WarpUtils.py index 59f762c2eb..ab91cf8d41 100644 --- a/nipype/interfaces/fsl/tests/test_auto_WarpUtils.py +++ b/nipype/interfaces/fsl/tests/test_auto_WarpUtils.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import WarpUtils diff --git a/nipype/interfaces/fsl/tests/test_auto_XFibres5.py b/nipype/interfaces/fsl/tests/test_auto_XFibres5.py index 80ee0fca8f..1a8bb61389 100644 --- a/nipype/interfaces/fsl/tests/test_auto_XFibres5.py +++ b/nipype/interfaces/fsl/tests/test_auto_XFibres5.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dti import XFibres5 diff --git a/nipype/interfaces/fsl/tests/test_dti.py b/nipype/interfaces/fsl/tests/test_dti.py index cd76766dd8..19d807d217 100644 --- a/nipype/interfaces/fsl/tests/test_dti.py +++ b/nipype/interfaces/fsl/tests/test_dti.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: -from builtins import open, range import os import nipype.interfaces.fsl.dti as fsl diff --git a/nipype/interfaces/fsl/tests/test_maths.py b/nipype/interfaces/fsl/tests/test_maths.py index b8aa41dc6b..7760c6dbe4 100644 --- a/nipype/interfaces/fsl/tests/test_maths.py +++ b/nipype/interfaces/fsl/tests/test_maths.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 division -from __future__ import unicode_literals -from builtins import open import os import numpy as np diff --git a/nipype/interfaces/fsl/tests/test_model.py b/nipype/interfaces/fsl/tests/test_model.py index 8b8d0b7b40..c5c2f5bf35 100644 --- a/nipype/interfaces/fsl/tests/test_model.py +++ b/nipype/interfaces/fsl/tests/test_model.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: -from builtins import open - import os import pytest diff --git a/nipype/interfaces/fsl/tests/test_preprocess.py b/nipype/interfaces/fsl/tests/test_preprocess.py index 4b387201cf..5caffae1b1 100644 --- a/nipype/interfaces/fsl/tests/test_preprocess.py +++ b/nipype/interfaces/fsl/tests/test_preprocess.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals -from builtins import str # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: -from builtins import open - import os from copy import deepcopy diff --git a/nipype/interfaces/fsl/utils.py b/nipype/interfaces/fsl/utils.py index e0b430a2be..dacb8c9228 100644 --- a/nipype/interfaces/fsl/utils.py +++ b/nipype/interfaces/fsl/utils.py @@ -9,10 +9,6 @@ -------- See the docstrings of the individual classes for examples. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import map, range - import os import os.path as op import re diff --git a/nipype/interfaces/io.py b/nipype/interfaces/io.py index 556d85db4d..a5498f5c9f 100644 --- a/nipype/interfaces/io.py +++ b/nipype/interfaces/io.py @@ -11,10 +11,6 @@ To come : XNATSink """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import object, zip, filter, range, open, str - import glob import fnmatch import string @@ -32,8 +28,7 @@ from .. import config, logging from ..utils.filemanip import ( copyfile, simplify_list, ensure_list, - get_related_files, split_filename, - FileExistsError) + get_related_files, split_filename) from ..utils.misc import human_order_sorted, str2bool from .base import ( TraitedSpec, traits, Str, File, Directory, BaseInterface, InputMultiPath, diff --git a/nipype/interfaces/matlab.py b/nipype/interfaces/matlab.py index fed7bfeb57..71fc7ab0e5 100644 --- a/nipype/interfaces/matlab.py +++ b/nipype/interfaces/matlab.py @@ -2,9 +2,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: """ General matlab interface code """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open import os from .. import config diff --git a/nipype/interfaces/meshfix.py b/nipype/interfaces/meshfix.py index 231f1fea9d..53c7f56cfe 100644 --- a/nipype/interfaces/meshfix.py +++ b/nipype/interfaces/meshfix.py @@ -3,8 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """ Fixes meshes: """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os.path as op from ..utils.filemanip import split_filename diff --git a/nipype/interfaces/minc/base.py b/nipype/interfaces/minc/base.py index 67b7938176..9436c2c3d1 100644 --- a/nipype/interfaces/minc/base.py +++ b/nipype/interfaces/minc/base.py @@ -8,9 +8,6 @@ Author: Carlo Hamalainen http://carlo-hamalainen.net """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import object import os import os.path import warnings diff --git a/nipype/interfaces/minc/minc.py b/nipype/interfaces/minc/minc.py index 907d35675f..791c7bbc64 100644 --- a/nipype/interfaces/minc/minc.py +++ b/nipype/interfaces/minc/minc.py @@ -8,10 +8,6 @@ Author: Carlo Hamalainen http://carlo-hamalainen.net """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open - import glob import os import os.path diff --git a/nipype/interfaces/minc/testdata.py b/nipype/interfaces/minc/testdata.py index 0a8d6bfd88..f027efa35e 100644 --- a/nipype/interfaces/minc/testdata.py +++ b/nipype/interfaces/minc/testdata.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os from ...testing import example_data diff --git a/nipype/interfaces/minc/tests/test_auto_Average.py b/nipype/interfaces/minc/tests/test_auto_Average.py index 6f0e84d144..dd8b49efe3 100644 --- a/nipype/interfaces/minc/tests/test_auto_Average.py +++ b/nipype/interfaces/minc/tests/test_auto_Average.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Average diff --git a/nipype/interfaces/minc/tests/test_auto_BBox.py b/nipype/interfaces/minc/tests/test_auto_BBox.py index 7bdf35f03d..9b92660b9a 100644 --- a/nipype/interfaces/minc/tests/test_auto_BBox.py +++ b/nipype/interfaces/minc/tests/test_auto_BBox.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import BBox diff --git a/nipype/interfaces/minc/tests/test_auto_Beast.py b/nipype/interfaces/minc/tests/test_auto_Beast.py index 3a44b436b0..62944284a6 100644 --- a/nipype/interfaces/minc/tests/test_auto_Beast.py +++ b/nipype/interfaces/minc/tests/test_auto_Beast.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Beast diff --git a/nipype/interfaces/minc/tests/test_auto_BestLinReg.py b/nipype/interfaces/minc/tests/test_auto_BestLinReg.py index ef6e5af537..64aceb6182 100644 --- a/nipype/interfaces/minc/tests/test_auto_BestLinReg.py +++ b/nipype/interfaces/minc/tests/test_auto_BestLinReg.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import BestLinReg diff --git a/nipype/interfaces/minc/tests/test_auto_BigAverage.py b/nipype/interfaces/minc/tests/test_auto_BigAverage.py index b9933c116b..30c8540598 100644 --- a/nipype/interfaces/minc/tests/test_auto_BigAverage.py +++ b/nipype/interfaces/minc/tests/test_auto_BigAverage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import BigAverage diff --git a/nipype/interfaces/minc/tests/test_auto_Blob.py b/nipype/interfaces/minc/tests/test_auto_Blob.py index b83d5b90a5..2cce7f294d 100644 --- a/nipype/interfaces/minc/tests/test_auto_Blob.py +++ b/nipype/interfaces/minc/tests/test_auto_Blob.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Blob diff --git a/nipype/interfaces/minc/tests/test_auto_Blur.py b/nipype/interfaces/minc/tests/test_auto_Blur.py index 2342d65974..267863d80c 100644 --- a/nipype/interfaces/minc/tests/test_auto_Blur.py +++ b/nipype/interfaces/minc/tests/test_auto_Blur.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Blur diff --git a/nipype/interfaces/minc/tests/test_auto_Calc.py b/nipype/interfaces/minc/tests/test_auto_Calc.py index d5fb316e39..6d077c5a52 100644 --- a/nipype/interfaces/minc/tests/test_auto_Calc.py +++ b/nipype/interfaces/minc/tests/test_auto_Calc.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Calc diff --git a/nipype/interfaces/minc/tests/test_auto_Convert.py b/nipype/interfaces/minc/tests/test_auto_Convert.py index 174efd8a10..ba312ea2d3 100644 --- a/nipype/interfaces/minc/tests/test_auto_Convert.py +++ b/nipype/interfaces/minc/tests/test_auto_Convert.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Convert diff --git a/nipype/interfaces/minc/tests/test_auto_Copy.py b/nipype/interfaces/minc/tests/test_auto_Copy.py index d92a63d812..7bb0605c39 100644 --- a/nipype/interfaces/minc/tests/test_auto_Copy.py +++ b/nipype/interfaces/minc/tests/test_auto_Copy.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Copy diff --git a/nipype/interfaces/minc/tests/test_auto_Dump.py b/nipype/interfaces/minc/tests/test_auto_Dump.py index fbd33f5a46..4713f0aec3 100644 --- a/nipype/interfaces/minc/tests/test_auto_Dump.py +++ b/nipype/interfaces/minc/tests/test_auto_Dump.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Dump diff --git a/nipype/interfaces/minc/tests/test_auto_Extract.py b/nipype/interfaces/minc/tests/test_auto_Extract.py index fbd0a84729..a3dfb069e5 100644 --- a/nipype/interfaces/minc/tests/test_auto_Extract.py +++ b/nipype/interfaces/minc/tests/test_auto_Extract.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Extract diff --git a/nipype/interfaces/minc/tests/test_auto_Gennlxfm.py b/nipype/interfaces/minc/tests/test_auto_Gennlxfm.py index 0249c861bc..58383c799e 100644 --- a/nipype/interfaces/minc/tests/test_auto_Gennlxfm.py +++ b/nipype/interfaces/minc/tests/test_auto_Gennlxfm.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Gennlxfm diff --git a/nipype/interfaces/minc/tests/test_auto_Math.py b/nipype/interfaces/minc/tests/test_auto_Math.py index 41d75379d4..4758c9d897 100644 --- a/nipype/interfaces/minc/tests/test_auto_Math.py +++ b/nipype/interfaces/minc/tests/test_auto_Math.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Math diff --git a/nipype/interfaces/minc/tests/test_auto_NlpFit.py b/nipype/interfaces/minc/tests/test_auto_NlpFit.py index b0ad4087fa..c0092ab704 100644 --- a/nipype/interfaces/minc/tests/test_auto_NlpFit.py +++ b/nipype/interfaces/minc/tests/test_auto_NlpFit.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import NlpFit diff --git a/nipype/interfaces/minc/tests/test_auto_Norm.py b/nipype/interfaces/minc/tests/test_auto_Norm.py index cdd4a3db7c..4bbae0454f 100644 --- a/nipype/interfaces/minc/tests/test_auto_Norm.py +++ b/nipype/interfaces/minc/tests/test_auto_Norm.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Norm diff --git a/nipype/interfaces/minc/tests/test_auto_Pik.py b/nipype/interfaces/minc/tests/test_auto_Pik.py index 748f21a976..2a2ff5f851 100644 --- a/nipype/interfaces/minc/tests/test_auto_Pik.py +++ b/nipype/interfaces/minc/tests/test_auto_Pik.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Pik diff --git a/nipype/interfaces/minc/tests/test_auto_Resample.py b/nipype/interfaces/minc/tests/test_auto_Resample.py index da512d9f62..3fdf821b88 100644 --- a/nipype/interfaces/minc/tests/test_auto_Resample.py +++ b/nipype/interfaces/minc/tests/test_auto_Resample.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Resample diff --git a/nipype/interfaces/minc/tests/test_auto_Reshape.py b/nipype/interfaces/minc/tests/test_auto_Reshape.py index d80f9a377b..4d51d6800b 100644 --- a/nipype/interfaces/minc/tests/test_auto_Reshape.py +++ b/nipype/interfaces/minc/tests/test_auto_Reshape.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Reshape diff --git a/nipype/interfaces/minc/tests/test_auto_ToEcat.py b/nipype/interfaces/minc/tests/test_auto_ToEcat.py index b755263566..eb64e6fa0b 100644 --- a/nipype/interfaces/minc/tests/test_auto_ToEcat.py +++ b/nipype/interfaces/minc/tests/test_auto_ToEcat.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import ToEcat diff --git a/nipype/interfaces/minc/tests/test_auto_ToRaw.py b/nipype/interfaces/minc/tests/test_auto_ToRaw.py index 42ba72f145..f0aa06d3ad 100644 --- a/nipype/interfaces/minc/tests/test_auto_ToRaw.py +++ b/nipype/interfaces/minc/tests/test_auto_ToRaw.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import ToRaw diff --git a/nipype/interfaces/minc/tests/test_auto_VolSymm.py b/nipype/interfaces/minc/tests/test_auto_VolSymm.py index ae3332b7f2..b71a1105a3 100644 --- a/nipype/interfaces/minc/tests/test_auto_VolSymm.py +++ b/nipype/interfaces/minc/tests/test_auto_VolSymm.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import VolSymm diff --git a/nipype/interfaces/minc/tests/test_auto_Volcentre.py b/nipype/interfaces/minc/tests/test_auto_Volcentre.py index 0e54c67583..7b43524fe4 100644 --- a/nipype/interfaces/minc/tests/test_auto_Volcentre.py +++ b/nipype/interfaces/minc/tests/test_auto_Volcentre.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Volcentre diff --git a/nipype/interfaces/minc/tests/test_auto_Voliso.py b/nipype/interfaces/minc/tests/test_auto_Voliso.py index 33923046d0..873a763468 100644 --- a/nipype/interfaces/minc/tests/test_auto_Voliso.py +++ b/nipype/interfaces/minc/tests/test_auto_Voliso.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Voliso diff --git a/nipype/interfaces/minc/tests/test_auto_Volpad.py b/nipype/interfaces/minc/tests/test_auto_Volpad.py index c5fe679935..910ca5d827 100644 --- a/nipype/interfaces/minc/tests/test_auto_Volpad.py +++ b/nipype/interfaces/minc/tests/test_auto_Volpad.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import Volpad diff --git a/nipype/interfaces/minc/tests/test_auto_XfmAvg.py b/nipype/interfaces/minc/tests/test_auto_XfmAvg.py index 283ef63e40..dc8a7028e8 100644 --- a/nipype/interfaces/minc/tests/test_auto_XfmAvg.py +++ b/nipype/interfaces/minc/tests/test_auto_XfmAvg.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import XfmAvg diff --git a/nipype/interfaces/minc/tests/test_auto_XfmConcat.py b/nipype/interfaces/minc/tests/test_auto_XfmConcat.py index 4e42b4ed45..a9dfa63cad 100644 --- a/nipype/interfaces/minc/tests/test_auto_XfmConcat.py +++ b/nipype/interfaces/minc/tests/test_auto_XfmConcat.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import XfmConcat diff --git a/nipype/interfaces/minc/tests/test_auto_XfmInvert.py b/nipype/interfaces/minc/tests/test_auto_XfmInvert.py index 69c455f875..4dacaa4876 100644 --- a/nipype/interfaces/minc/tests/test_auto_XfmInvert.py +++ b/nipype/interfaces/minc/tests/test_auto_XfmInvert.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..minc import XfmInvert diff --git a/nipype/interfaces/mipav/__init__.py b/nipype/interfaces/mipav/__init__.py index 8a9e08fd9b..2d5fce8652 100644 --- a/nipype/interfaces/mipav/__init__.py +++ b/nipype/interfaces/mipav/__init__.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) from .developer import ( JistLaminarVolumetricLayering, JistBrainMgdmSegmentation, JistLaminarProfileGeometry, JistLaminarProfileCalculator, MedicAlgorithmN3, diff --git a/nipype/interfaces/mipav/tests/test_auto_JistBrainMgdmSegmentation.py b/nipype/interfaces/mipav/tests/test_auto_JistBrainMgdmSegmentation.py index 4bc44eaeb5..70ff508dfb 100644 --- a/nipype/interfaces/mipav/tests/test_auto_JistBrainMgdmSegmentation.py +++ b/nipype/interfaces/mipav/tests/test_auto_JistBrainMgdmSegmentation.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import JistBrainMgdmSegmentation diff --git a/nipype/interfaces/mipav/tests/test_auto_JistBrainMp2rageDuraEstimation.py b/nipype/interfaces/mipav/tests/test_auto_JistBrainMp2rageDuraEstimation.py index 9ecec6f789..3fcbeaf418 100644 --- a/nipype/interfaces/mipav/tests/test_auto_JistBrainMp2rageDuraEstimation.py +++ b/nipype/interfaces/mipav/tests/test_auto_JistBrainMp2rageDuraEstimation.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import JistBrainMp2rageDuraEstimation diff --git a/nipype/interfaces/mipav/tests/test_auto_JistBrainMp2rageSkullStripping.py b/nipype/interfaces/mipav/tests/test_auto_JistBrainMp2rageSkullStripping.py index 73d02f8c97..378a5eb7bb 100644 --- a/nipype/interfaces/mipav/tests/test_auto_JistBrainMp2rageSkullStripping.py +++ b/nipype/interfaces/mipav/tests/test_auto_JistBrainMp2rageSkullStripping.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import JistBrainMp2rageSkullStripping diff --git a/nipype/interfaces/mipav/tests/test_auto_JistBrainPartialVolumeFilter.py b/nipype/interfaces/mipav/tests/test_auto_JistBrainPartialVolumeFilter.py index 0ab4cea836..229d58ec2b 100644 --- a/nipype/interfaces/mipav/tests/test_auto_JistBrainPartialVolumeFilter.py +++ b/nipype/interfaces/mipav/tests/test_auto_JistBrainPartialVolumeFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import JistBrainPartialVolumeFilter diff --git a/nipype/interfaces/mipav/tests/test_auto_JistCortexSurfaceMeshInflation.py b/nipype/interfaces/mipav/tests/test_auto_JistCortexSurfaceMeshInflation.py index 5c3a8b1cba..2790fa75b4 100644 --- a/nipype/interfaces/mipav/tests/test_auto_JistCortexSurfaceMeshInflation.py +++ b/nipype/interfaces/mipav/tests/test_auto_JistCortexSurfaceMeshInflation.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import JistCortexSurfaceMeshInflation diff --git a/nipype/interfaces/mipav/tests/test_auto_JistIntensityMp2rageMasking.py b/nipype/interfaces/mipav/tests/test_auto_JistIntensityMp2rageMasking.py index 9b02ce9346..ae294ff2d1 100644 --- a/nipype/interfaces/mipav/tests/test_auto_JistIntensityMp2rageMasking.py +++ b/nipype/interfaces/mipav/tests/test_auto_JistIntensityMp2rageMasking.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import JistIntensityMp2rageMasking diff --git a/nipype/interfaces/mipav/tests/test_auto_JistLaminarProfileCalculator.py b/nipype/interfaces/mipav/tests/test_auto_JistLaminarProfileCalculator.py index e8740dca7f..a9695e39ce 100644 --- a/nipype/interfaces/mipav/tests/test_auto_JistLaminarProfileCalculator.py +++ b/nipype/interfaces/mipav/tests/test_auto_JistLaminarProfileCalculator.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import JistLaminarProfileCalculator diff --git a/nipype/interfaces/mipav/tests/test_auto_JistLaminarProfileGeometry.py b/nipype/interfaces/mipav/tests/test_auto_JistLaminarProfileGeometry.py index fd4e496fbf..7b0dc2c788 100644 --- a/nipype/interfaces/mipav/tests/test_auto_JistLaminarProfileGeometry.py +++ b/nipype/interfaces/mipav/tests/test_auto_JistLaminarProfileGeometry.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import JistLaminarProfileGeometry diff --git a/nipype/interfaces/mipav/tests/test_auto_JistLaminarProfileSampling.py b/nipype/interfaces/mipav/tests/test_auto_JistLaminarProfileSampling.py index 37f4a26212..7ef82a5920 100644 --- a/nipype/interfaces/mipav/tests/test_auto_JistLaminarProfileSampling.py +++ b/nipype/interfaces/mipav/tests/test_auto_JistLaminarProfileSampling.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import JistLaminarProfileSampling diff --git a/nipype/interfaces/mipav/tests/test_auto_JistLaminarROIAveraging.py b/nipype/interfaces/mipav/tests/test_auto_JistLaminarROIAveraging.py index 9ffe1ddb52..4536d3a58c 100644 --- a/nipype/interfaces/mipav/tests/test_auto_JistLaminarROIAveraging.py +++ b/nipype/interfaces/mipav/tests/test_auto_JistLaminarROIAveraging.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import JistLaminarROIAveraging diff --git a/nipype/interfaces/mipav/tests/test_auto_JistLaminarVolumetricLayering.py b/nipype/interfaces/mipav/tests/test_auto_JistLaminarVolumetricLayering.py index 1fb5c644cc..17d44c7cec 100644 --- a/nipype/interfaces/mipav/tests/test_auto_JistLaminarVolumetricLayering.py +++ b/nipype/interfaces/mipav/tests/test_auto_JistLaminarVolumetricLayering.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import JistLaminarVolumetricLayering diff --git a/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmImageCalculator.py b/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmImageCalculator.py index 96dcf57050..353a521492 100644 --- a/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmImageCalculator.py +++ b/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmImageCalculator.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import MedicAlgorithmImageCalculator diff --git a/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmLesionToads.py b/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmLesionToads.py index c9191fb0e7..8024590f92 100644 --- a/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmLesionToads.py +++ b/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmLesionToads.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import MedicAlgorithmLesionToads diff --git a/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmMipavReorient.py b/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmMipavReorient.py index 4abe453f31..14a9829a11 100644 --- a/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmMipavReorient.py +++ b/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmMipavReorient.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import MedicAlgorithmMipavReorient diff --git a/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmN3.py b/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmN3.py index f06f6f41d8..f1623bb19b 100644 --- a/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmN3.py +++ b/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmN3.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import MedicAlgorithmN3 diff --git a/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmSPECTRE2010.py b/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmSPECTRE2010.py index a3cfba10af..e2de49a746 100644 --- a/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmSPECTRE2010.py +++ b/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmSPECTRE2010.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import MedicAlgorithmSPECTRE2010 diff --git a/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmThresholdToBinaryMask.py b/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmThresholdToBinaryMask.py index b498025401..e4bfae7e0f 100644 --- a/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmThresholdToBinaryMask.py +++ b/nipype/interfaces/mipav/tests/test_auto_MedicAlgorithmThresholdToBinaryMask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import MedicAlgorithmThresholdToBinaryMask diff --git a/nipype/interfaces/mipav/tests/test_auto_RandomVol.py b/nipype/interfaces/mipav/tests/test_auto_RandomVol.py index e97aa87285..8c9662c9be 100644 --- a/nipype/interfaces/mipav/tests/test_auto_RandomVol.py +++ b/nipype/interfaces/mipav/tests/test_auto_RandomVol.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..developer import RandomVol diff --git a/nipype/interfaces/mixins/reporting.py b/nipype/interfaces/mixins/reporting.py index 3f4d1b1317..fecdb337c5 100644 --- a/nipype/interfaces/mixins/reporting.py +++ b/nipype/interfaces/mixins/reporting.py @@ -2,8 +2,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: """ class mixin and utilities for enabling reports for nipype interfaces """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os from abc import abstractmethod diff --git a/nipype/interfaces/mixins/tests/test_auto_ReportCapableInterface.py b/nipype/interfaces/mixins/tests/test_auto_ReportCapableInterface.py index 8985d7069d..0cf527114b 100644 --- a/nipype/interfaces/mixins/tests/test_auto_ReportCapableInterface.py +++ b/nipype/interfaces/mixins/tests/test_auto_ReportCapableInterface.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..reporting import ReportCapableInterface diff --git a/nipype/interfaces/mne/base.py b/nipype/interfaces/mne/base.py index b6c8320e7a..175a73e126 100644 --- a/nipype/interfaces/mne/base.py +++ b/nipype/interfaces/mne/base.py @@ -1,8 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import str, bytes - import os.path as op import glob diff --git a/nipype/interfaces/mne/tests/test_auto_WatershedBEM.py b/nipype/interfaces/mne/tests/test_auto_WatershedBEM.py index 0fe9f88276..2664a7d437 100644 --- a/nipype/interfaces/mne/tests/test_auto_WatershedBEM.py +++ b/nipype/interfaces/mne/tests/test_auto_WatershedBEM.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import WatershedBEM diff --git a/nipype/interfaces/mrtrix/convert.py b/nipype/interfaces/mrtrix/convert.py index 4c1b6e4ef5..53dbbffcb1 100644 --- a/nipype/interfaces/mrtrix/convert.py +++ b/nipype/interfaces/mrtrix/convert.py @@ -1,10 +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) -from io import open - import os.path as op import nibabel as nb import nibabel.trackvis as trk diff --git a/nipype/interfaces/mrtrix/preprocess.py b/nipype/interfaces/mrtrix/preprocess.py index 5fc67177a1..adc2ef27d7 100644 --- a/nipype/interfaces/mrtrix/preprocess.py +++ b/nipype/interfaces/mrtrix/preprocess.py @@ -1,8 +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.path as op diff --git a/nipype/interfaces/mrtrix/tensors.py b/nipype/interfaces/mrtrix/tensors.py index 04c901f1f9..6751b6196d 100644 --- a/nipype/interfaces/mrtrix/tensors.py +++ b/nipype/interfaces/mrtrix/tensors.py @@ -1,8 +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.path as op import numpy as np diff --git a/nipype/interfaces/mrtrix/tests/test_auto_ConstrainedSphericalDeconvolution.py b/nipype/interfaces/mrtrix/tests/test_auto_ConstrainedSphericalDeconvolution.py index 3b5dd2f5c6..ba11991004 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_ConstrainedSphericalDeconvolution.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_ConstrainedSphericalDeconvolution.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tensors import ConstrainedSphericalDeconvolution diff --git a/nipype/interfaces/mrtrix/tests/test_auto_DWI2SphericalHarmonicsImage.py b/nipype/interfaces/mrtrix/tests/test_auto_DWI2SphericalHarmonicsImage.py index 6911f153ed..12246fa6c8 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_DWI2SphericalHarmonicsImage.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_DWI2SphericalHarmonicsImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tensors import DWI2SphericalHarmonicsImage diff --git a/nipype/interfaces/mrtrix/tests/test_auto_DWI2Tensor.py b/nipype/interfaces/mrtrix/tests/test_auto_DWI2Tensor.py index 0844fb58f2..69f3be425f 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_DWI2Tensor.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_DWI2Tensor.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import DWI2Tensor diff --git a/nipype/interfaces/mrtrix/tests/test_auto_DiffusionTensorStreamlineTrack.py b/nipype/interfaces/mrtrix/tests/test_auto_DiffusionTensorStreamlineTrack.py index 4a411a85b2..35b5ec1063 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_DiffusionTensorStreamlineTrack.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_DiffusionTensorStreamlineTrack.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tracking import DiffusionTensorStreamlineTrack diff --git a/nipype/interfaces/mrtrix/tests/test_auto_Directions2Amplitude.py b/nipype/interfaces/mrtrix/tests/test_auto_Directions2Amplitude.py index a674b2be88..a68cf10cd3 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_Directions2Amplitude.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_Directions2Amplitude.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tensors import Directions2Amplitude diff --git a/nipype/interfaces/mrtrix/tests/test_auto_Erode.py b/nipype/interfaces/mrtrix/tests/test_auto_Erode.py index f723a002c1..10f6d464de 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_Erode.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_Erode.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Erode diff --git a/nipype/interfaces/mrtrix/tests/test_auto_EstimateResponseForSH.py b/nipype/interfaces/mrtrix/tests/test_auto_EstimateResponseForSH.py index 25f9718501..5eb68f522a 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_EstimateResponseForSH.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_EstimateResponseForSH.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tensors import EstimateResponseForSH diff --git a/nipype/interfaces/mrtrix/tests/test_auto_FSL2MRTrix.py b/nipype/interfaces/mrtrix/tests/test_auto_FSL2MRTrix.py index 96ce4a84f4..d5b8bb8f76 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_FSL2MRTrix.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_FSL2MRTrix.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tensors import FSL2MRTrix diff --git a/nipype/interfaces/mrtrix/tests/test_auto_FilterTracks.py b/nipype/interfaces/mrtrix/tests/test_auto_FilterTracks.py index 182e8f79de..bda0a2059b 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_FilterTracks.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_FilterTracks.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tracking import FilterTracks diff --git a/nipype/interfaces/mrtrix/tests/test_auto_FindShPeaks.py b/nipype/interfaces/mrtrix/tests/test_auto_FindShPeaks.py index 7bd9657d66..010b912752 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_FindShPeaks.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_FindShPeaks.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tensors import FindShPeaks diff --git a/nipype/interfaces/mrtrix/tests/test_auto_GenerateDirections.py b/nipype/interfaces/mrtrix/tests/test_auto_GenerateDirections.py index 7449a7fcaa..ae8f2a3cfa 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_GenerateDirections.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_GenerateDirections.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tensors import GenerateDirections diff --git a/nipype/interfaces/mrtrix/tests/test_auto_GenerateWhiteMatterMask.py b/nipype/interfaces/mrtrix/tests/test_auto_GenerateWhiteMatterMask.py index 98fa1d6e54..f558927eab 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_GenerateWhiteMatterMask.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_GenerateWhiteMatterMask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import GenerateWhiteMatterMask diff --git a/nipype/interfaces/mrtrix/tests/test_auto_MRConvert.py b/nipype/interfaces/mrtrix/tests/test_auto_MRConvert.py index 2dec516f43..d2b9a02030 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_MRConvert.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_MRConvert.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import MRConvert diff --git a/nipype/interfaces/mrtrix/tests/test_auto_MRMultiply.py b/nipype/interfaces/mrtrix/tests/test_auto_MRMultiply.py index c8446664bf..fa9526c037 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_MRMultiply.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_MRMultiply.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import MRMultiply diff --git a/nipype/interfaces/mrtrix/tests/test_auto_MRTransform.py b/nipype/interfaces/mrtrix/tests/test_auto_MRTransform.py index 31b74cd09d..d41758e65e 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_MRTransform.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_MRTransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import MRTransform diff --git a/nipype/interfaces/mrtrix/tests/test_auto_MRTrix2TrackVis.py b/nipype/interfaces/mrtrix/tests/test_auto_MRTrix2TrackVis.py index 9e663ee818..130436fae6 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_MRTrix2TrackVis.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_MRTrix2TrackVis.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..convert import MRTrix2TrackVis diff --git a/nipype/interfaces/mrtrix/tests/test_auto_MRTrixInfo.py b/nipype/interfaces/mrtrix/tests/test_auto_MRTrixInfo.py index 05107b81bd..1ca965b012 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_MRTrixInfo.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_MRTrixInfo.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import MRTrixInfo diff --git a/nipype/interfaces/mrtrix/tests/test_auto_MRTrixViewer.py b/nipype/interfaces/mrtrix/tests/test_auto_MRTrixViewer.py index 117258ea17..dd8b6066c3 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_MRTrixViewer.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_MRTrixViewer.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import MRTrixViewer diff --git a/nipype/interfaces/mrtrix/tests/test_auto_MedianFilter3D.py b/nipype/interfaces/mrtrix/tests/test_auto_MedianFilter3D.py index b4c6c2af91..68e255e9d3 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_MedianFilter3D.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_MedianFilter3D.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import MedianFilter3D diff --git a/nipype/interfaces/mrtrix/tests/test_auto_ProbabilisticSphericallyDeconvolutedStreamlineTrack.py b/nipype/interfaces/mrtrix/tests/test_auto_ProbabilisticSphericallyDeconvolutedStreamlineTrack.py index 29f0a38e6d..0dd42aab78 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_ProbabilisticSphericallyDeconvolutedStreamlineTrack.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_ProbabilisticSphericallyDeconvolutedStreamlineTrack.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tracking import ProbabilisticSphericallyDeconvolutedStreamlineTrack diff --git a/nipype/interfaces/mrtrix/tests/test_auto_SphericallyDeconvolutedStreamlineTrack.py b/nipype/interfaces/mrtrix/tests/test_auto_SphericallyDeconvolutedStreamlineTrack.py index f54aec96a7..3a1c806453 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_SphericallyDeconvolutedStreamlineTrack.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_SphericallyDeconvolutedStreamlineTrack.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tracking import SphericallyDeconvolutedStreamlineTrack diff --git a/nipype/interfaces/mrtrix/tests/test_auto_StreamlineTrack.py b/nipype/interfaces/mrtrix/tests/test_auto_StreamlineTrack.py index 69f1ce65c0..5515305a1f 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_StreamlineTrack.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_StreamlineTrack.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tracking import StreamlineTrack diff --git a/nipype/interfaces/mrtrix/tests/test_auto_Tensor2ApparentDiffusion.py b/nipype/interfaces/mrtrix/tests/test_auto_Tensor2ApparentDiffusion.py index dfa7f862e3..088760ae85 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_Tensor2ApparentDiffusion.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_Tensor2ApparentDiffusion.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Tensor2ApparentDiffusion diff --git a/nipype/interfaces/mrtrix/tests/test_auto_Tensor2FractionalAnisotropy.py b/nipype/interfaces/mrtrix/tests/test_auto_Tensor2FractionalAnisotropy.py index eafdba5a7c..376755ef8f 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_Tensor2FractionalAnisotropy.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_Tensor2FractionalAnisotropy.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Tensor2FractionalAnisotropy diff --git a/nipype/interfaces/mrtrix/tests/test_auto_Tensor2Vector.py b/nipype/interfaces/mrtrix/tests/test_auto_Tensor2Vector.py index b982c46bbd..93b1a2cf7f 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_Tensor2Vector.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_Tensor2Vector.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Tensor2Vector diff --git a/nipype/interfaces/mrtrix/tests/test_auto_Threshold.py b/nipype/interfaces/mrtrix/tests/test_auto_Threshold.py index f53b8098eb..1edaf3cc24 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_Threshold.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_Threshold.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Threshold diff --git a/nipype/interfaces/mrtrix/tests/test_auto_Tracks2Prob.py b/nipype/interfaces/mrtrix/tests/test_auto_Tracks2Prob.py index fa9eb184ef..55b320809e 100644 --- a/nipype/interfaces/mrtrix/tests/test_auto_Tracks2Prob.py +++ b/nipype/interfaces/mrtrix/tests/test_auto_Tracks2Prob.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tracking import Tracks2Prob diff --git a/nipype/interfaces/mrtrix/tracking.py b/nipype/interfaces/mrtrix/tracking.py index 7a7ed995f0..f115841482 100644 --- a/nipype/interfaces/mrtrix/tracking.py +++ b/nipype/interfaces/mrtrix/tracking.py @@ -1,8 +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 import os.path as op diff --git a/nipype/interfaces/mrtrix3/__init__.py b/nipype/interfaces/mrtrix3/__init__.py index 87b12e7442..9fb4311730 100644 --- a/nipype/interfaces/mrtrix3/__init__.py +++ b/nipype/interfaces/mrtrix3/__init__.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -*- coding: utf-8 -*- diff --git a/nipype/interfaces/mrtrix3/base.py b/nipype/interfaces/mrtrix3/base.py index dfcc2c3787..53a9a2284e 100644 --- a/nipype/interfaces/mrtrix3/base.py +++ b/nipype/interfaces/mrtrix3/base.py @@ -1,8 +1,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) from ... import logging, LooseVersion from ...utils.filemanip import which diff --git a/nipype/interfaces/mrtrix3/connectivity.py b/nipype/interfaces/mrtrix3/connectivity.py index 0e246c796b..63277d7a38 100644 --- a/nipype/interfaces/mrtrix3/connectivity.py +++ b/nipype/interfaces/mrtrix3/connectivity.py @@ -1,8 +1,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os import os.path as op diff --git a/nipype/interfaces/mrtrix3/preprocess.py b/nipype/interfaces/mrtrix3/preprocess.py index 3f8056c7dd..eeeb9e820a 100644 --- a/nipype/interfaces/mrtrix3/preprocess.py +++ b/nipype/interfaces/mrtrix3/preprocess.py @@ -1,8 +1,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os.path as op diff --git a/nipype/interfaces/mrtrix3/reconst.py b/nipype/interfaces/mrtrix3/reconst.py index 4e2db8de3f..be89022267 100644 --- a/nipype/interfaces/mrtrix3/reconst.py +++ b/nipype/interfaces/mrtrix3/reconst.py @@ -1,8 +1,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os.path as op diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_ACTPrepareFSL.py b/nipype/interfaces/mrtrix3/tests/test_auto_ACTPrepareFSL.py index 43f588e075..137ddec81f 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_ACTPrepareFSL.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_ACTPrepareFSL.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import ACTPrepareFSL diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_BrainMask.py b/nipype/interfaces/mrtrix3/tests/test_auto_BrainMask.py index 5ee1e8cb00..9d22520268 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_BrainMask.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_BrainMask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import BrainMask diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_BuildConnectome.py b/nipype/interfaces/mrtrix3/tests/test_auto_BuildConnectome.py index dba96f097e..2e4c70cbe4 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_BuildConnectome.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_BuildConnectome.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..connectivity import BuildConnectome diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_ComputeTDI.py b/nipype/interfaces/mrtrix3/tests/test_auto_ComputeTDI.py index b4eb5de3a0..81fcf0ad7d 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_ComputeTDI.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_ComputeTDI.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ComputeTDI diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_DWIBiasCorrect.py b/nipype/interfaces/mrtrix3/tests/test_auto_DWIBiasCorrect.py index f72f36daaa..d5accaa3ee 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_DWIBiasCorrect.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_DWIBiasCorrect.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import DWIBiasCorrect diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_DWIDenoise.py b/nipype/interfaces/mrtrix3/tests/test_auto_DWIDenoise.py index 64ef1284e7..248ab20da2 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_DWIDenoise.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_DWIDenoise.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import DWIDenoise diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_DWIExtract.py b/nipype/interfaces/mrtrix3/tests/test_auto_DWIExtract.py index 59617b30ab..67f4992768 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_DWIExtract.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_DWIExtract.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import DWIExtract diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_EstimateFOD.py b/nipype/interfaces/mrtrix3/tests/test_auto_EstimateFOD.py index 9f991d51cc..495257ca03 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_EstimateFOD.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_EstimateFOD.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..reconst import EstimateFOD diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_FitTensor.py b/nipype/interfaces/mrtrix3/tests/test_auto_FitTensor.py index 8f8142746a..9491194e77 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_FitTensor.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_FitTensor.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..reconst import FitTensor diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_Generate5tt.py b/nipype/interfaces/mrtrix3/tests/test_auto_Generate5tt.py index f7032cb624..d73ea20a1c 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_Generate5tt.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_Generate5tt.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Generate5tt diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_LabelConfig.py b/nipype/interfaces/mrtrix3/tests/test_auto_LabelConfig.py index 1dc8d6e0b1..90a0f25314 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_LabelConfig.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_LabelConfig.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..connectivity import LabelConfig diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_LabelConvert.py b/nipype/interfaces/mrtrix3/tests/test_auto_LabelConvert.py index 82cebd8bbc..6d4a6c8dcb 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_LabelConvert.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_LabelConvert.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..connectivity import LabelConvert diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_MRConvert.py b/nipype/interfaces/mrtrix3/tests/test_auto_MRConvert.py index f11b615cc8..b959c22546 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_MRConvert.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_MRConvert.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MRConvert diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_MRDeGibbs.py b/nipype/interfaces/mrtrix3/tests/test_auto_MRDeGibbs.py index cd730465e1..010fbb8a25 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_MRDeGibbs.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_MRDeGibbs.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import MRDeGibbs diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_MRMath.py b/nipype/interfaces/mrtrix3/tests/test_auto_MRMath.py index fe934c45b1..d2a1d057b8 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_MRMath.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_MRMath.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MRMath diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_MRResize.py b/nipype/interfaces/mrtrix3/tests/test_auto_MRResize.py index a81528d44a..3c904259b5 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_MRResize.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_MRResize.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import MRResize diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_MRTrix3Base.py b/nipype/interfaces/mrtrix3/tests/test_auto_MRTrix3Base.py index 453baa053a..ed91143ab8 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_MRTrix3Base.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_MRTrix3Base.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import MRTrix3Base diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_Mesh2PVE.py b/nipype/interfaces/mrtrix3/tests/test_auto_Mesh2PVE.py index f2605532e6..92a5349d04 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_Mesh2PVE.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_Mesh2PVE.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Mesh2PVE diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_ReplaceFSwithFIRST.py b/nipype/interfaces/mrtrix3/tests/test_auto_ReplaceFSwithFIRST.py index 561a1a9538..4a78432f5e 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_ReplaceFSwithFIRST.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_ReplaceFSwithFIRST.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import ReplaceFSwithFIRST diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_ResponseSD.py b/nipype/interfaces/mrtrix3/tests/test_auto_ResponseSD.py index 9415cae211..fee3dce67e 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_ResponseSD.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_ResponseSD.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import ResponseSD diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_TCK2VTK.py b/nipype/interfaces/mrtrix3/tests/test_auto_TCK2VTK.py index 064e15288e..d841a3fc6f 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_TCK2VTK.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_TCK2VTK.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import TCK2VTK diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_TensorMetrics.py b/nipype/interfaces/mrtrix3/tests/test_auto_TensorMetrics.py index b6bc738109..45da9dbf1c 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_TensorMetrics.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_TensorMetrics.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import TensorMetrics diff --git a/nipype/interfaces/mrtrix3/tests/test_auto_Tractography.py b/nipype/interfaces/mrtrix3/tests/test_auto_Tractography.py index cf685a50d8..f8239c5341 100644 --- a/nipype/interfaces/mrtrix3/tests/test_auto_Tractography.py +++ b/nipype/interfaces/mrtrix3/tests/test_auto_Tractography.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..tracking import Tractography diff --git a/nipype/interfaces/mrtrix3/tracking.py b/nipype/interfaces/mrtrix3/tracking.py index ea71752763..fb7d8e7375 100644 --- a/nipype/interfaces/mrtrix3/tracking.py +++ b/nipype/interfaces/mrtrix3/tracking.py @@ -1,8 +1,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os.path as op diff --git a/nipype/interfaces/mrtrix3/utils.py b/nipype/interfaces/mrtrix3/utils.py index 52122189bf..52f5caab64 100644 --- a/nipype/interfaces/mrtrix3/utils.py +++ b/nipype/interfaces/mrtrix3/utils.py @@ -1,8 +1,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os.path as op diff --git a/nipype/interfaces/niftyfit/tests/test_auto_DwiTool.py b/nipype/interfaces/niftyfit/tests/test_auto_DwiTool.py index 2a58b39d57..9a59243c9e 100644 --- a/nipype/interfaces/niftyfit/tests/test_auto_DwiTool.py +++ b/nipype/interfaces/niftyfit/tests/test_auto_DwiTool.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dwi import DwiTool diff --git a/nipype/interfaces/niftyfit/tests/test_auto_FitAsl.py b/nipype/interfaces/niftyfit/tests/test_auto_FitAsl.py index 94a489a4ad..7e2401ed7f 100644 --- a/nipype/interfaces/niftyfit/tests/test_auto_FitAsl.py +++ b/nipype/interfaces/niftyfit/tests/test_auto_FitAsl.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..asl import FitAsl diff --git a/nipype/interfaces/niftyfit/tests/test_auto_FitDwi.py b/nipype/interfaces/niftyfit/tests/test_auto_FitDwi.py index 2086d12a2b..afb70755fc 100644 --- a/nipype/interfaces/niftyfit/tests/test_auto_FitDwi.py +++ b/nipype/interfaces/niftyfit/tests/test_auto_FitDwi.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dwi import FitDwi diff --git a/nipype/interfaces/niftyfit/tests/test_auto_FitQt1.py b/nipype/interfaces/niftyfit/tests/test_auto_FitQt1.py index b184e448cd..e27aee7da2 100644 --- a/nipype/interfaces/niftyfit/tests/test_auto_FitQt1.py +++ b/nipype/interfaces/niftyfit/tests/test_auto_FitQt1.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..qt1 import FitQt1 diff --git a/nipype/interfaces/niftyfit/tests/test_auto_NiftyFitCommand.py b/nipype/interfaces/niftyfit/tests/test_auto_NiftyFitCommand.py index 6bfeb3c9d3..83d600d26e 100644 --- a/nipype/interfaces/niftyfit/tests/test_auto_NiftyFitCommand.py +++ b/nipype/interfaces/niftyfit/tests/test_auto_NiftyFitCommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import NiftyFitCommand diff --git a/nipype/interfaces/niftyreg/base.py b/nipype/interfaces/niftyreg/base.py index bd8a280aa5..0b1e0c514a 100644 --- a/nipype/interfaces/niftyreg/base.py +++ b/nipype/interfaces/niftyreg/base.py @@ -15,10 +15,6 @@ See the docstrings of the individual classes for examples. """ - -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import property, super from distutils.version import StrictVersion import os diff --git a/nipype/interfaces/niftyreg/reg.py b/nipype/interfaces/niftyreg/reg.py index f36752b872..26985a3e58 100644 --- a/nipype/interfaces/niftyreg/reg.py +++ b/nipype/interfaces/niftyreg/reg.py @@ -7,10 +7,6 @@ The interfaces were written to work with niftyreg version 1.5.10 """ - -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import staticmethod import os from ..base import TraitedSpec, File, traits, isdefined diff --git a/nipype/interfaces/niftyreg/regutils.py b/nipype/interfaces/niftyreg/regutils.py index c90aa53bed..2d08a7119d 100644 --- a/nipype/interfaces/niftyreg/regutils.py +++ b/nipype/interfaces/niftyreg/regutils.py @@ -6,10 +6,6 @@ The interfaces were written to work with niftyreg version 1.5.10 """ - -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import len, open, property, super import os from ..base import TraitedSpec, File, traits, isdefined diff --git a/nipype/interfaces/niftyreg/tests/test_auto_NiftyRegCommand.py b/nipype/interfaces/niftyreg/tests/test_auto_NiftyRegCommand.py index 89615b50d7..016ca5654b 100644 --- a/nipype/interfaces/niftyreg/tests/test_auto_NiftyRegCommand.py +++ b/nipype/interfaces/niftyreg/tests/test_auto_NiftyRegCommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import NiftyRegCommand diff --git a/nipype/interfaces/niftyreg/tests/test_auto_RegAladin.py b/nipype/interfaces/niftyreg/tests/test_auto_RegAladin.py index 436fbb9b29..ed11753b5d 100644 --- a/nipype/interfaces/niftyreg/tests/test_auto_RegAladin.py +++ b/nipype/interfaces/niftyreg/tests/test_auto_RegAladin.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..reg import RegAladin diff --git a/nipype/interfaces/niftyreg/tests/test_auto_RegAverage.py b/nipype/interfaces/niftyreg/tests/test_auto_RegAverage.py index b0a39752cf..8eb40cd38e 100644 --- a/nipype/interfaces/niftyreg/tests/test_auto_RegAverage.py +++ b/nipype/interfaces/niftyreg/tests/test_auto_RegAverage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..regutils import RegAverage diff --git a/nipype/interfaces/niftyreg/tests/test_auto_RegF3D.py b/nipype/interfaces/niftyreg/tests/test_auto_RegF3D.py index 7d1fb8d27c..20fdee1f08 100644 --- a/nipype/interfaces/niftyreg/tests/test_auto_RegF3D.py +++ b/nipype/interfaces/niftyreg/tests/test_auto_RegF3D.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..reg import RegF3D diff --git a/nipype/interfaces/niftyreg/tests/test_auto_RegJacobian.py b/nipype/interfaces/niftyreg/tests/test_auto_RegJacobian.py index 38615d8edd..9c08f4ef42 100644 --- a/nipype/interfaces/niftyreg/tests/test_auto_RegJacobian.py +++ b/nipype/interfaces/niftyreg/tests/test_auto_RegJacobian.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..regutils import RegJacobian diff --git a/nipype/interfaces/niftyreg/tests/test_auto_RegMeasure.py b/nipype/interfaces/niftyreg/tests/test_auto_RegMeasure.py index 4f30029e2f..93224b8a90 100644 --- a/nipype/interfaces/niftyreg/tests/test_auto_RegMeasure.py +++ b/nipype/interfaces/niftyreg/tests/test_auto_RegMeasure.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..regutils import RegMeasure diff --git a/nipype/interfaces/niftyreg/tests/test_auto_RegResample.py b/nipype/interfaces/niftyreg/tests/test_auto_RegResample.py index 80e4241ec7..5a1852a97d 100644 --- a/nipype/interfaces/niftyreg/tests/test_auto_RegResample.py +++ b/nipype/interfaces/niftyreg/tests/test_auto_RegResample.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..regutils import RegResample diff --git a/nipype/interfaces/niftyreg/tests/test_auto_RegTools.py b/nipype/interfaces/niftyreg/tests/test_auto_RegTools.py index c1d1f65542..9b81307511 100644 --- a/nipype/interfaces/niftyreg/tests/test_auto_RegTools.py +++ b/nipype/interfaces/niftyreg/tests/test_auto_RegTools.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..regutils import RegTools diff --git a/nipype/interfaces/niftyreg/tests/test_auto_RegTransform.py b/nipype/interfaces/niftyreg/tests/test_auto_RegTransform.py index 50f666a1df..07df2bb65b 100644 --- a/nipype/interfaces/niftyreg/tests/test_auto_RegTransform.py +++ b/nipype/interfaces/niftyreg/tests/test_auto_RegTransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..regutils import RegTransform diff --git a/nipype/interfaces/niftyseg/base.py b/nipype/interfaces/niftyseg/base.py index d68bbcc73b..cc831aa9b5 100644 --- a/nipype/interfaces/niftyseg/base.py +++ b/nipype/interfaces/niftyseg/base.py @@ -15,8 +15,6 @@ -------- See the docstrings of the individual classes for examples. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) from ..niftyfit.base import NiftyFitCommand diff --git a/nipype/interfaces/niftyseg/label_fusion.py b/nipype/interfaces/niftyseg/label_fusion.py index 1b0237d37c..5185b64f68 100644 --- a/nipype/interfaces/niftyseg/label_fusion.py +++ b/nipype/interfaces/niftyseg/label_fusion.py @@ -4,8 +4,6 @@ The fusion module provides higher-level interfaces to some of the operations that can be performed with the seg_LabFusion command-line program. """ - -from builtins import str import os import warnings diff --git a/nipype/interfaces/niftyseg/stats.py b/nipype/interfaces/niftyseg/stats.py index 796e07410c..94c7abd49e 100644 --- a/nipype/interfaces/niftyseg/stats.py +++ b/nipype/interfaces/niftyseg/stats.py @@ -4,7 +4,6 @@ The stats module provides higher-level interfaces to some of the operations that can be performed with the niftyseg stats (seg_stats) command-line program. """ -from __future__ import print_function import numpy as np from ..base import TraitedSpec, File, traits, CommandLineInputSpec diff --git a/nipype/interfaces/niftyseg/tests/test_auto_BinaryMaths.py b/nipype/interfaces/niftyseg/tests/test_auto_BinaryMaths.py index 657ceddf4d..d094c52724 100644 --- a/nipype/interfaces/niftyseg/tests/test_auto_BinaryMaths.py +++ b/nipype/interfaces/niftyseg/tests/test_auto_BinaryMaths.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import BinaryMaths diff --git a/nipype/interfaces/niftyseg/tests/test_auto_BinaryMathsInteger.py b/nipype/interfaces/niftyseg/tests/test_auto_BinaryMathsInteger.py index 94ad3be1a4..7c80638583 100644 --- a/nipype/interfaces/niftyseg/tests/test_auto_BinaryMathsInteger.py +++ b/nipype/interfaces/niftyseg/tests/test_auto_BinaryMathsInteger.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import BinaryMathsInteger diff --git a/nipype/interfaces/niftyseg/tests/test_auto_BinaryStats.py b/nipype/interfaces/niftyseg/tests/test_auto_BinaryStats.py index 092ccce73a..184e089335 100644 --- a/nipype/interfaces/niftyseg/tests/test_auto_BinaryStats.py +++ b/nipype/interfaces/niftyseg/tests/test_auto_BinaryStats.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..stats import BinaryStats diff --git a/nipype/interfaces/niftyseg/tests/test_auto_CalcTopNCC.py b/nipype/interfaces/niftyseg/tests/test_auto_CalcTopNCC.py index d9dd712482..e75455c96f 100644 --- a/nipype/interfaces/niftyseg/tests/test_auto_CalcTopNCC.py +++ b/nipype/interfaces/niftyseg/tests/test_auto_CalcTopNCC.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..label_fusion import CalcTopNCC diff --git a/nipype/interfaces/niftyseg/tests/test_auto_EM.py b/nipype/interfaces/niftyseg/tests/test_auto_EM.py index 1fc798c2ec..eac0fd86a0 100644 --- a/nipype/interfaces/niftyseg/tests/test_auto_EM.py +++ b/nipype/interfaces/niftyseg/tests/test_auto_EM.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..em import EM diff --git a/nipype/interfaces/niftyseg/tests/test_auto_FillLesions.py b/nipype/interfaces/niftyseg/tests/test_auto_FillLesions.py index d798046995..a6d11d735e 100644 --- a/nipype/interfaces/niftyseg/tests/test_auto_FillLesions.py +++ b/nipype/interfaces/niftyseg/tests/test_auto_FillLesions.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..lesions import FillLesions diff --git a/nipype/interfaces/niftyseg/tests/test_auto_LabelFusion.py b/nipype/interfaces/niftyseg/tests/test_auto_LabelFusion.py index f3613f6130..5d8f170899 100644 --- a/nipype/interfaces/niftyseg/tests/test_auto_LabelFusion.py +++ b/nipype/interfaces/niftyseg/tests/test_auto_LabelFusion.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..label_fusion import LabelFusion diff --git a/nipype/interfaces/niftyseg/tests/test_auto_MathsCommand.py b/nipype/interfaces/niftyseg/tests/test_auto_MathsCommand.py index f93739d102..742e12447c 100644 --- a/nipype/interfaces/niftyseg/tests/test_auto_MathsCommand.py +++ b/nipype/interfaces/niftyseg/tests/test_auto_MathsCommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import MathsCommand diff --git a/nipype/interfaces/niftyseg/tests/test_auto_Merge.py b/nipype/interfaces/niftyseg/tests/test_auto_Merge.py index 714a8f87b4..02052f2ada 100644 --- a/nipype/interfaces/niftyseg/tests/test_auto_Merge.py +++ b/nipype/interfaces/niftyseg/tests/test_auto_Merge.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import Merge diff --git a/nipype/interfaces/niftyseg/tests/test_auto_NiftySegCommand.py b/nipype/interfaces/niftyseg/tests/test_auto_NiftySegCommand.py index d840a40b2a..c0d36cdfe6 100644 --- a/nipype/interfaces/niftyseg/tests/test_auto_NiftySegCommand.py +++ b/nipype/interfaces/niftyseg/tests/test_auto_NiftySegCommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import NiftySegCommand diff --git a/nipype/interfaces/niftyseg/tests/test_auto_PatchMatch.py b/nipype/interfaces/niftyseg/tests/test_auto_PatchMatch.py index e88270d650..9206be5647 100644 --- a/nipype/interfaces/niftyseg/tests/test_auto_PatchMatch.py +++ b/nipype/interfaces/niftyseg/tests/test_auto_PatchMatch.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..patchmatch import PatchMatch diff --git a/nipype/interfaces/niftyseg/tests/test_auto_StatsCommand.py b/nipype/interfaces/niftyseg/tests/test_auto_StatsCommand.py index 9ce93ab93a..b4a3e25cdb 100644 --- a/nipype/interfaces/niftyseg/tests/test_auto_StatsCommand.py +++ b/nipype/interfaces/niftyseg/tests/test_auto_StatsCommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..stats import StatsCommand diff --git a/nipype/interfaces/niftyseg/tests/test_auto_TupleMaths.py b/nipype/interfaces/niftyseg/tests/test_auto_TupleMaths.py index 75177ab0e0..30f03e31a1 100644 --- a/nipype/interfaces/niftyseg/tests/test_auto_TupleMaths.py +++ b/nipype/interfaces/niftyseg/tests/test_auto_TupleMaths.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import TupleMaths diff --git a/nipype/interfaces/niftyseg/tests/test_auto_UnaryMaths.py b/nipype/interfaces/niftyseg/tests/test_auto_UnaryMaths.py index 0cd68ca4ee..5acd5cb1e3 100644 --- a/nipype/interfaces/niftyseg/tests/test_auto_UnaryMaths.py +++ b/nipype/interfaces/niftyseg/tests/test_auto_UnaryMaths.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maths import UnaryMaths diff --git a/nipype/interfaces/niftyseg/tests/test_auto_UnaryStats.py b/nipype/interfaces/niftyseg/tests/test_auto_UnaryStats.py index 3f158fac20..9e3d7f81fc 100644 --- a/nipype/interfaces/niftyseg/tests/test_auto_UnaryStats.py +++ b/nipype/interfaces/niftyseg/tests/test_auto_UnaryStats.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..stats import UnaryStats diff --git a/nipype/interfaces/nilearn.py b/nipype/interfaces/nilearn.py index 699b7dc8d3..06bfdf899f 100644 --- a/nipype/interfaces/nilearn.py +++ b/nipype/interfaces/nilearn.py @@ -4,8 +4,6 @@ ''' Algorithms to compute statistics on :abbr:`fMRI (functional MRI)` ''' -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os import numpy as np diff --git a/nipype/interfaces/nipy/model.py b/nipype/interfaces/nipy/model.py index c26168e7b3..66d1bbb6a9 100644 --- a/nipype/interfaces/nipy/model.py +++ b/nipype/interfaces/nipy/model.py @@ -1,8 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range, str, bytes - import os from ...utils import NUMPY_MMAP diff --git a/nipype/interfaces/nipy/preprocess.py b/nipype/interfaces/nipy/preprocess.py index 666aa27837..0f6ee5031d 100644 --- a/nipype/interfaces/nipy/preprocess.py +++ b/nipype/interfaces/nipy/preprocess.py @@ -1,8 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open - import os import nibabel as nb diff --git a/nipype/interfaces/nipy/tests/test_auto_ComputeMask.py b/nipype/interfaces/nipy/tests/test_auto_ComputeMask.py index 84e74e969c..943b3f43d4 100644 --- a/nipype/interfaces/nipy/tests/test_auto_ComputeMask.py +++ b/nipype/interfaces/nipy/tests/test_auto_ComputeMask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import ComputeMask diff --git a/nipype/interfaces/nipy/tests/test_auto_EstimateContrast.py b/nipype/interfaces/nipy/tests/test_auto_EstimateContrast.py index 9a9b5c421c..3f9d725fac 100644 --- a/nipype/interfaces/nipy/tests/test_auto_EstimateContrast.py +++ b/nipype/interfaces/nipy/tests/test_auto_EstimateContrast.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import EstimateContrast diff --git a/nipype/interfaces/nipy/tests/test_auto_FitGLM.py b/nipype/interfaces/nipy/tests/test_auto_FitGLM.py index 71ca221efc..d453b98a25 100644 --- a/nipype/interfaces/nipy/tests/test_auto_FitGLM.py +++ b/nipype/interfaces/nipy/tests/test_auto_FitGLM.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import FitGLM diff --git a/nipype/interfaces/nipy/tests/test_auto_NipyBaseInterface.py b/nipype/interfaces/nipy/tests/test_auto_NipyBaseInterface.py index ca91500995..64df6d9636 100644 --- a/nipype/interfaces/nipy/tests/test_auto_NipyBaseInterface.py +++ b/nipype/interfaces/nipy/tests/test_auto_NipyBaseInterface.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import NipyBaseInterface diff --git a/nipype/interfaces/nipy/tests/test_auto_Similarity.py b/nipype/interfaces/nipy/tests/test_auto_Similarity.py index 09a466b8a3..e09754d382 100644 --- a/nipype/interfaces/nipy/tests/test_auto_Similarity.py +++ b/nipype/interfaces/nipy/tests/test_auto_Similarity.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Similarity diff --git a/nipype/interfaces/nipy/tests/test_auto_SpaceTimeRealigner.py b/nipype/interfaces/nipy/tests/test_auto_SpaceTimeRealigner.py index fca6664a49..c511737c70 100644 --- a/nipype/interfaces/nipy/tests/test_auto_SpaceTimeRealigner.py +++ b/nipype/interfaces/nipy/tests/test_auto_SpaceTimeRealigner.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import SpaceTimeRealigner diff --git a/nipype/interfaces/nipy/tests/test_auto_Trim.py b/nipype/interfaces/nipy/tests/test_auto_Trim.py index 1e013f2063..ff7e66ab97 100644 --- a/nipype/interfaces/nipy/tests/test_auto_Trim.py +++ b/nipype/interfaces/nipy/tests/test_auto_Trim.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Trim diff --git a/nipype/interfaces/nipy/utils.py b/nipype/interfaces/nipy/utils.py index 406960fc6d..22856c01d6 100644 --- a/nipype/interfaces/nipy/utils.py +++ b/nipype/interfaces/nipy/utils.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import warnings import nibabel as nb diff --git a/nipype/interfaces/nitime/analysis.py b/nipype/interfaces/nitime/analysis.py index 6e8ff17d0f..7f393efadf 100644 --- a/nipype/interfaces/nitime/analysis.py +++ b/nipype/interfaces/nitime/analysis.py @@ -10,10 +10,6 @@ - nitime.viz.drawmatrix_channels """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import zip, object, open - import numpy as np import tempfile diff --git a/nipype/interfaces/nitime/tests/test_auto_CoherenceAnalyzer.py b/nipype/interfaces/nitime/tests/test_auto_CoherenceAnalyzer.py index a9f1ca8769..0af36046ac 100644 --- a/nipype/interfaces/nitime/tests/test_auto_CoherenceAnalyzer.py +++ b/nipype/interfaces/nitime/tests/test_auto_CoherenceAnalyzer.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..analysis import CoherenceAnalyzer diff --git a/nipype/interfaces/nitime/tests/test_auto_NitimeBaseInterface.py b/nipype/interfaces/nitime/tests/test_auto_NitimeBaseInterface.py index bf827b81b2..56b6b5d923 100644 --- a/nipype/interfaces/nitime/tests/test_auto_NitimeBaseInterface.py +++ b/nipype/interfaces/nitime/tests/test_auto_NitimeBaseInterface.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import NitimeBaseInterface diff --git a/nipype/interfaces/petpvc.py b/nipype/interfaces/petpvc.py index 63a0a8ed83..ffa892e7e0 100644 --- a/nipype/interfaces/petpvc.py +++ b/nipype/interfaces/petpvc.py @@ -1,8 +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 diff --git a/nipype/interfaces/quickshear.py b/nipype/interfaces/quickshear.py index b1317c3599..7508c0a356 100644 --- a/nipype/interfaces/quickshear.py +++ b/nipype/interfaces/quickshear.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- """ Quickshear is a simple geometric defacing algorithm """ -from __future__ import unicode_literals from .base import CommandLineInputSpec, CommandLine, traits, TraitedSpec, File from ..external.due import BibTeX diff --git a/nipype/interfaces/semtools/__init__.py b/nipype/interfaces/semtools/__init__.py index 14473b8381..243e3a43a0 100644 --- a/nipype/interfaces/semtools/__init__.py +++ b/nipype/interfaces/semtools/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .diffusion import * from .featurecreator import GenerateCsfClippedFromClassifiedImage from .segmentation import * diff --git a/nipype/interfaces/semtools/brains/__init__.py b/nipype/interfaces/semtools/brains/__init__.py index ebfab84bf3..a8bd05a1be 100644 --- a/nipype/interfaces/semtools/brains/__init__.py +++ b/nipype/interfaces/semtools/brains/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .segmentation import SimilarityIndex, BRAINSTalairach, BRAINSTalairachMask from .utilities import (HistogramMatchingFilter, GenerateEdgeMapImage, GeneratePurePlugMask) diff --git a/nipype/interfaces/semtools/brains/tests/test_auto_BRAINSPosteriorToContinuousClass.py b/nipype/interfaces/semtools/brains/tests/test_auto_BRAINSPosteriorToContinuousClass.py index 88efbd6ed2..a3478e0af0 100644 --- a/nipype/interfaces/semtools/brains/tests/test_auto_BRAINSPosteriorToContinuousClass.py +++ b/nipype/interfaces/semtools/brains/tests/test_auto_BRAINSPosteriorToContinuousClass.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..classify import BRAINSPosteriorToContinuousClass diff --git a/nipype/interfaces/semtools/brains/tests/test_auto_BRAINSTalairach.py b/nipype/interfaces/semtools/brains/tests/test_auto_BRAINSTalairach.py index 8161cd4fad..398330e5f9 100644 --- a/nipype/interfaces/semtools/brains/tests/test_auto_BRAINSTalairach.py +++ b/nipype/interfaces/semtools/brains/tests/test_auto_BRAINSTalairach.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..segmentation import BRAINSTalairach diff --git a/nipype/interfaces/semtools/brains/tests/test_auto_BRAINSTalairachMask.py b/nipype/interfaces/semtools/brains/tests/test_auto_BRAINSTalairachMask.py index 19fd531a7e..97f353ad96 100644 --- a/nipype/interfaces/semtools/brains/tests/test_auto_BRAINSTalairachMask.py +++ b/nipype/interfaces/semtools/brains/tests/test_auto_BRAINSTalairachMask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..segmentation import BRAINSTalairachMask diff --git a/nipype/interfaces/semtools/brains/tests/test_auto_GenerateEdgeMapImage.py b/nipype/interfaces/semtools/brains/tests/test_auto_GenerateEdgeMapImage.py index a9e12c5584..7c5256cea4 100644 --- a/nipype/interfaces/semtools/brains/tests/test_auto_GenerateEdgeMapImage.py +++ b/nipype/interfaces/semtools/brains/tests/test_auto_GenerateEdgeMapImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utilities import GenerateEdgeMapImage diff --git a/nipype/interfaces/semtools/brains/tests/test_auto_GeneratePurePlugMask.py b/nipype/interfaces/semtools/brains/tests/test_auto_GeneratePurePlugMask.py index 5728b575a3..2cc68391bd 100644 --- a/nipype/interfaces/semtools/brains/tests/test_auto_GeneratePurePlugMask.py +++ b/nipype/interfaces/semtools/brains/tests/test_auto_GeneratePurePlugMask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utilities import GeneratePurePlugMask diff --git a/nipype/interfaces/semtools/brains/tests/test_auto_HistogramMatchingFilter.py b/nipype/interfaces/semtools/brains/tests/test_auto_HistogramMatchingFilter.py index 0f4fbd5a18..a257b52384 100644 --- a/nipype/interfaces/semtools/brains/tests/test_auto_HistogramMatchingFilter.py +++ b/nipype/interfaces/semtools/brains/tests/test_auto_HistogramMatchingFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utilities import HistogramMatchingFilter diff --git a/nipype/interfaces/semtools/brains/tests/test_auto_SimilarityIndex.py b/nipype/interfaces/semtools/brains/tests/test_auto_SimilarityIndex.py index f66caff4f6..8a09941f16 100644 --- a/nipype/interfaces/semtools/brains/tests/test_auto_SimilarityIndex.py +++ b/nipype/interfaces/semtools/brains/tests/test_auto_SimilarityIndex.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..segmentation import SimilarityIndex diff --git a/nipype/interfaces/semtools/diffusion/__init__.py b/nipype/interfaces/semtools/diffusion/__init__.py index 215cfa41d7..f9f414d087 100644 --- a/nipype/interfaces/semtools/diffusion/__init__.py +++ b/nipype/interfaces/semtools/diffusion/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .diffusion import dtiaverage, dtiestim, dtiprocess, DWIConvert from .tractography import * from .gtract import ( diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_DWIConvert.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_DWIConvert.py index 734363402a..3b1578cc42 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_DWIConvert.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_DWIConvert.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..diffusion import DWIConvert diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_compareTractInclusion.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_compareTractInclusion.py index 3ab83055bb..601c33628b 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_compareTractInclusion.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_compareTractInclusion.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import compareTractInclusion diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_dtiaverage.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_dtiaverage.py index 6b21e7a648..6af27942ea 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_dtiaverage.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_dtiaverage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..diffusion import dtiaverage diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_dtiestim.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_dtiestim.py index acc0fb30f9..afa519667b 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_dtiestim.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_dtiestim.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..diffusion import dtiestim diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_dtiprocess.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_dtiprocess.py index cb06505959..5095e7d469 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_dtiprocess.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_dtiprocess.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..diffusion import dtiprocess diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_extractNrrdVectorIndex.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_extractNrrdVectorIndex.py index d39aaec246..f0ef5a1bbd 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_extractNrrdVectorIndex.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_extractNrrdVectorIndex.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import extractNrrdVectorIndex diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractAnisotropyMap.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractAnisotropyMap.py index e0d804827c..02e8e364ee 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractAnisotropyMap.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractAnisotropyMap.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractAnisotropyMap diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractAverageBvalues.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractAverageBvalues.py index 44bd558800..59f8fef00c 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractAverageBvalues.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractAverageBvalues.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractAverageBvalues diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractClipAnisotropy.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractClipAnisotropy.py index 0b3a0505ef..cf44a5361e 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractClipAnisotropy.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractClipAnisotropy.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractClipAnisotropy diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCoRegAnatomy.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCoRegAnatomy.py index e6c241d053..ae2924540d 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCoRegAnatomy.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCoRegAnatomy.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractCoRegAnatomy diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractConcatDwi.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractConcatDwi.py index 5099ba1bac..3320da9206 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractConcatDwi.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractConcatDwi.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractConcatDwi diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCopyImageOrientation.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCopyImageOrientation.py index a464fcd7a1..e9ac5031cb 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCopyImageOrientation.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCopyImageOrientation.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractCopyImageOrientation diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCoregBvalues.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCoregBvalues.py index f99c27aa68..316c2ab507 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCoregBvalues.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCoregBvalues.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractCoregBvalues diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCostFastMarching.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCostFastMarching.py index 75d5d13e4e..08e262b306 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCostFastMarching.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCostFastMarching.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractCostFastMarching diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCreateGuideFiber.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCreateGuideFiber.py index e2dff9e309..4129974e29 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCreateGuideFiber.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractCreateGuideFiber.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractCreateGuideFiber diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractFastMarchingTracking.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractFastMarchingTracking.py index 2342a73cb1..1b71e0c953 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractFastMarchingTracking.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractFastMarchingTracking.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractFastMarchingTracking diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractFiberTracking.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractFiberTracking.py index 233f7358f5..2f68a54610 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractFiberTracking.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractFiberTracking.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractFiberTracking diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractImageConformity.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractImageConformity.py index e811627909..37157c27b6 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractImageConformity.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractImageConformity.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractImageConformity diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractInvertBSplineTransform.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractInvertBSplineTransform.py index 9ffcb11e11..e15985bbf6 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractInvertBSplineTransform.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractInvertBSplineTransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractInvertBSplineTransform diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractInvertDisplacementField.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractInvertDisplacementField.py index 7d1468dba6..97b2038c06 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractInvertDisplacementField.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractInvertDisplacementField.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractInvertDisplacementField diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractInvertRigidTransform.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractInvertRigidTransform.py index 0d67bb2669..60d92c44ac 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractInvertRigidTransform.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractInvertRigidTransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractInvertRigidTransform diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleAnisotropy.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleAnisotropy.py index 5e95276c83..dc2916a5fe 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleAnisotropy.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleAnisotropy.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractResampleAnisotropy diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleB0.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleB0.py index c9bde14e9a..ec80dd6268 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleB0.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleB0.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractResampleB0 diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleCodeImage.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleCodeImage.py index 27ad9e5e7d..01c8e024db 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleCodeImage.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleCodeImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractResampleCodeImage diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleDWIInPlace.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleDWIInPlace.py index be98d4a3e3..e1ce459566 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleDWIInPlace.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleDWIInPlace.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractResampleDWIInPlace diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleFibers.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleFibers.py index ea9612996c..c957857860 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleFibers.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractResampleFibers.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractResampleFibers diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractTensor.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractTensor.py index 9887f0e224..be941353cd 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractTensor.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractTensor.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractTensor diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractTransformToDisplacementField.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractTransformToDisplacementField.py index 17731d6648..9b965676db 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractTransformToDisplacementField.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_gtractTransformToDisplacementField.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..gtract import gtractTransformToDisplacementField diff --git a/nipype/interfaces/semtools/diffusion/tests/test_auto_maxcurvature.py b/nipype/interfaces/semtools/diffusion/tests/test_auto_maxcurvature.py index 511e6c8844..1cef41a6c7 100644 --- a/nipype/interfaces/semtools/diffusion/tests/test_auto_maxcurvature.py +++ b/nipype/interfaces/semtools/diffusion/tests/test_auto_maxcurvature.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..maxcurvature import maxcurvature diff --git a/nipype/interfaces/semtools/diffusion/tractography/__init__.py b/nipype/interfaces/semtools/diffusion/tractography/__init__.py index f846b7fde5..ac45b2050f 100644 --- a/nipype/interfaces/semtools/diffusion/tractography/__init__.py +++ b/nipype/interfaces/semtools/diffusion/tractography/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .commandlineonly import fiberstats from .fiberprocess import fiberprocess from .fibertrack import fibertrack diff --git a/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_UKFTractography.py b/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_UKFTractography.py index b713d0b053..1a40f44cc3 100644 --- a/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_UKFTractography.py +++ b/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_UKFTractography.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..ukftractography import UKFTractography diff --git a/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_fiberprocess.py b/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_fiberprocess.py index 3cd4ad6135..e34b12cffc 100644 --- a/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_fiberprocess.py +++ b/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_fiberprocess.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..fiberprocess import fiberprocess diff --git a/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_fiberstats.py b/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_fiberstats.py index e02ddc54a7..c3f750e4cb 100644 --- a/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_fiberstats.py +++ b/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_fiberstats.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..commandlineonly import fiberstats diff --git a/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_fibertrack.py b/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_fibertrack.py index 397f7ebd2d..1d241b8388 100644 --- a/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_fibertrack.py +++ b/nipype/interfaces/semtools/diffusion/tractography/tests/test_auto_fibertrack.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..fibertrack import fibertrack diff --git a/nipype/interfaces/semtools/filtering/__init__.py b/nipype/interfaces/semtools/filtering/__init__.py index 1e69233303..82ad67a9c1 100644 --- a/nipype/interfaces/semtools/filtering/__init__.py +++ b/nipype/interfaces/semtools/filtering/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .denoising import UnbiasedNonLocalMeans from .featuredetection import ( GenerateSummedGradientImage, CannySegmentationLevelSetImageFilter, diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_CannyEdge.py b/nipype/interfaces/semtools/filtering/tests/test_auto_CannyEdge.py index fbaf4dc841..da580ab5de 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_CannyEdge.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_CannyEdge.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import CannyEdge diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_CannySegmentationLevelSetImageFilter.py b/nipype/interfaces/semtools/filtering/tests/test_auto_CannySegmentationLevelSetImageFilter.py index 19bd6122ee..30f9fe6f15 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_CannySegmentationLevelSetImageFilter.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_CannySegmentationLevelSetImageFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import CannySegmentationLevelSetImageFilter diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_DilateImage.py b/nipype/interfaces/semtools/filtering/tests/test_auto_DilateImage.py index a054c2cf06..cf30cce648 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_DilateImage.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_DilateImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import DilateImage diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_DilateMask.py b/nipype/interfaces/semtools/filtering/tests/test_auto_DilateMask.py index bd1ce09b18..1da3cc6ebe 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_DilateMask.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_DilateMask.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import DilateMask diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_DistanceMaps.py b/nipype/interfaces/semtools/filtering/tests/test_auto_DistanceMaps.py index d956ea2ac1..d7de88405a 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_DistanceMaps.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_DistanceMaps.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import DistanceMaps diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_DumpBinaryTrainingVectors.py b/nipype/interfaces/semtools/filtering/tests/test_auto_DumpBinaryTrainingVectors.py index 9e453b2f86..956f0ef34d 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_DumpBinaryTrainingVectors.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_DumpBinaryTrainingVectors.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import DumpBinaryTrainingVectors diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_ErodeImage.py b/nipype/interfaces/semtools/filtering/tests/test_auto_ErodeImage.py index 1180f25bd5..50552d0484 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_ErodeImage.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_ErodeImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import ErodeImage diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_FlippedDifference.py b/nipype/interfaces/semtools/filtering/tests/test_auto_FlippedDifference.py index e0de87a033..2f10684f7f 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_FlippedDifference.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_FlippedDifference.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import FlippedDifference diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_GenerateBrainClippedImage.py b/nipype/interfaces/semtools/filtering/tests/test_auto_GenerateBrainClippedImage.py index e987e60e73..20d1c1718a 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_GenerateBrainClippedImage.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_GenerateBrainClippedImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import GenerateBrainClippedImage diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_GenerateSummedGradientImage.py b/nipype/interfaces/semtools/filtering/tests/test_auto_GenerateSummedGradientImage.py index a538ea0933..5f5ba62aaa 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_GenerateSummedGradientImage.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_GenerateSummedGradientImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import GenerateSummedGradientImage diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_GenerateTestImage.py b/nipype/interfaces/semtools/filtering/tests/test_auto_GenerateTestImage.py index 38ff43b5d1..bd05325a42 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_GenerateTestImage.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_GenerateTestImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import GenerateTestImage diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_GradientAnisotropicDiffusionImageFilter.py b/nipype/interfaces/semtools/filtering/tests/test_auto_GradientAnisotropicDiffusionImageFilter.py index 23e035478e..e07ac2157e 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_GradientAnisotropicDiffusionImageFilter.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_GradientAnisotropicDiffusionImageFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import GradientAnisotropicDiffusionImageFilter diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_HammerAttributeCreator.py b/nipype/interfaces/semtools/filtering/tests/test_auto_HammerAttributeCreator.py index 0ca8acdee7..45e3e253ba 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_HammerAttributeCreator.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_HammerAttributeCreator.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import HammerAttributeCreator diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_NeighborhoodMean.py b/nipype/interfaces/semtools/filtering/tests/test_auto_NeighborhoodMean.py index 661b2ba0ae..db06fd3746 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_NeighborhoodMean.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_NeighborhoodMean.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import NeighborhoodMean diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_NeighborhoodMedian.py b/nipype/interfaces/semtools/filtering/tests/test_auto_NeighborhoodMedian.py index c3b9895edd..0ddeb1eb16 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_NeighborhoodMedian.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_NeighborhoodMedian.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import NeighborhoodMedian diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_STAPLEAnalysis.py b/nipype/interfaces/semtools/filtering/tests/test_auto_STAPLEAnalysis.py index 7b68d3d05e..095f678e51 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_STAPLEAnalysis.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_STAPLEAnalysis.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import STAPLEAnalysis diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_TextureFromNoiseImageFilter.py b/nipype/interfaces/semtools/filtering/tests/test_auto_TextureFromNoiseImageFilter.py index e76b825ca6..53d3031995 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_TextureFromNoiseImageFilter.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_TextureFromNoiseImageFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import TextureFromNoiseImageFilter diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_TextureMeasureFilter.py b/nipype/interfaces/semtools/filtering/tests/test_auto_TextureMeasureFilter.py index 9981d7b8ac..2306af1639 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_TextureMeasureFilter.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_TextureMeasureFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featuredetection import TextureMeasureFilter diff --git a/nipype/interfaces/semtools/filtering/tests/test_auto_UnbiasedNonLocalMeans.py b/nipype/interfaces/semtools/filtering/tests/test_auto_UnbiasedNonLocalMeans.py index 2eaeb1acef..edf1a78553 100644 --- a/nipype/interfaces/semtools/filtering/tests/test_auto_UnbiasedNonLocalMeans.py +++ b/nipype/interfaces/semtools/filtering/tests/test_auto_UnbiasedNonLocalMeans.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..denoising import UnbiasedNonLocalMeans diff --git a/nipype/interfaces/semtools/legacy/__init__.py b/nipype/interfaces/semtools/legacy/__init__.py index 3309d49d62..343704adb7 100644 --- a/nipype/interfaces/semtools/legacy/__init__.py +++ b/nipype/interfaces/semtools/legacy/__init__.py @@ -1,3 +1,2 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .registration import scalartransform diff --git a/nipype/interfaces/semtools/legacy/tests/test_auto_scalartransform.py b/nipype/interfaces/semtools/legacy/tests/test_auto_scalartransform.py index 7be4644031..d28abe6cc6 100644 --- a/nipype/interfaces/semtools/legacy/tests/test_auto_scalartransform.py +++ b/nipype/interfaces/semtools/legacy/tests/test_auto_scalartransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import scalartransform diff --git a/nipype/interfaces/semtools/registration/__init__.py b/nipype/interfaces/semtools/registration/__init__.py index 33bd60ad59..3487d13134 100644 --- a/nipype/interfaces/semtools/registration/__init__.py +++ b/nipype/interfaces/semtools/registration/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .specialized import (VBRAINSDemonWarp, BRAINSDemonWarp, BRAINSTransformFromFiducials) from .brainsresample import BRAINSResample diff --git a/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSDemonWarp.py b/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSDemonWarp.py index 18cd4c63ff..efe6d50fce 100644 --- a/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSDemonWarp.py +++ b/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSDemonWarp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import BRAINSDemonWarp diff --git a/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSFit.py b/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSFit.py index 2e949b33fb..81422f2296 100644 --- a/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSFit.py +++ b/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSFit.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsfit import BRAINSFit diff --git a/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSResample.py b/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSResample.py index e8d4c187b0..092689442d 100644 --- a/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSResample.py +++ b/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSResample.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsresample import BRAINSResample diff --git a/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSResize.py b/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSResize.py index 188bb31d49..98280ec104 100644 --- a/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSResize.py +++ b/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSResize.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsresize import BRAINSResize diff --git a/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSTransformFromFiducials.py b/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSTransformFromFiducials.py index 258a0fcc83..5fea3e44e3 100644 --- a/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSTransformFromFiducials.py +++ b/nipype/interfaces/semtools/registration/tests/test_auto_BRAINSTransformFromFiducials.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import BRAINSTransformFromFiducials diff --git a/nipype/interfaces/semtools/registration/tests/test_auto_VBRAINSDemonWarp.py b/nipype/interfaces/semtools/registration/tests/test_auto_VBRAINSDemonWarp.py index b196d318d4..fb0a3dd88e 100644 --- a/nipype/interfaces/semtools/registration/tests/test_auto_VBRAINSDemonWarp.py +++ b/nipype/interfaces/semtools/registration/tests/test_auto_VBRAINSDemonWarp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import VBRAINSDemonWarp diff --git a/nipype/interfaces/semtools/segmentation/__init__.py b/nipype/interfaces/semtools/segmentation/__init__.py index d0cd69e0c9..e5ea4e2776 100644 --- a/nipype/interfaces/semtools/segmentation/__init__.py +++ b/nipype/interfaces/semtools/segmentation/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .specialized import ( BRAINSCut, BRAINSROIAuto, BRAINSConstellationDetector, BRAINSCreateLabelMapFromProbabilityMaps, BinaryMaskEditorBasedOnLandmarks, diff --git a/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSABC.py b/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSABC.py index 6efd92d499..a6be21c287 100644 --- a/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSABC.py +++ b/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSABC.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import BRAINSABC diff --git a/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSConstellationDetector.py b/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSConstellationDetector.py index 6f6ceaf53e..7f1f2b747b 100644 --- a/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSConstellationDetector.py +++ b/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSConstellationDetector.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import BRAINSConstellationDetector diff --git a/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSCreateLabelMapFromProbabilityMaps.py b/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSCreateLabelMapFromProbabilityMaps.py index 8280bddf37..5d74d787b5 100644 --- a/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSCreateLabelMapFromProbabilityMaps.py +++ b/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSCreateLabelMapFromProbabilityMaps.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import BRAINSCreateLabelMapFromProbabilityMaps diff --git a/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSCut.py b/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSCut.py index 4f4c336670..4731029fb1 100644 --- a/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSCut.py +++ b/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSCut.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import BRAINSCut diff --git a/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSMultiSTAPLE.py b/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSMultiSTAPLE.py index 5b1ba96146..85364618b8 100644 --- a/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSMultiSTAPLE.py +++ b/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSMultiSTAPLE.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import BRAINSMultiSTAPLE diff --git a/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSROIAuto.py b/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSROIAuto.py index 469387ff3d..c4b68f598b 100644 --- a/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSROIAuto.py +++ b/nipype/interfaces/semtools/segmentation/tests/test_auto_BRAINSROIAuto.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import BRAINSROIAuto diff --git a/nipype/interfaces/semtools/segmentation/tests/test_auto_BinaryMaskEditorBasedOnLandmarks.py b/nipype/interfaces/semtools/segmentation/tests/test_auto_BinaryMaskEditorBasedOnLandmarks.py index 126db9eddb..859af9132b 100644 --- a/nipype/interfaces/semtools/segmentation/tests/test_auto_BinaryMaskEditorBasedOnLandmarks.py +++ b/nipype/interfaces/semtools/segmentation/tests/test_auto_BinaryMaskEditorBasedOnLandmarks.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import BinaryMaskEditorBasedOnLandmarks diff --git a/nipype/interfaces/semtools/segmentation/tests/test_auto_ESLR.py b/nipype/interfaces/semtools/segmentation/tests/test_auto_ESLR.py index f8848a6efb..8c006051a7 100644 --- a/nipype/interfaces/semtools/segmentation/tests/test_auto_ESLR.py +++ b/nipype/interfaces/semtools/segmentation/tests/test_auto_ESLR.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import ESLR diff --git a/nipype/interfaces/semtools/testing/__init__.py b/nipype/interfaces/semtools/testing/__init__.py index 66a4a2262e..d06a7ea2df 100644 --- a/nipype/interfaces/semtools/testing/__init__.py +++ b/nipype/interfaces/semtools/testing/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .featuredetection import SphericalCoordinateGeneration from .landmarkscompare import LandmarksCompare from .generateaveragelmkfile import GenerateAverageLmkFile diff --git a/nipype/interfaces/semtools/tests/test_auto_DWICompare.py b/nipype/interfaces/semtools/tests/test_auto_DWICompare.py index 1d9b9f4f71..305d60b6aa 100644 --- a/nipype/interfaces/semtools/tests/test_auto_DWICompare.py +++ b/nipype/interfaces/semtools/tests/test_auto_DWICompare.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..converters import DWICompare diff --git a/nipype/interfaces/semtools/tests/test_auto_DWISimpleCompare.py b/nipype/interfaces/semtools/tests/test_auto_DWISimpleCompare.py index b76979129f..9140141254 100644 --- a/nipype/interfaces/semtools/tests/test_auto_DWISimpleCompare.py +++ b/nipype/interfaces/semtools/tests/test_auto_DWISimpleCompare.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..converters import DWISimpleCompare diff --git a/nipype/interfaces/semtools/tests/test_auto_GenerateCsfClippedFromClassifiedImage.py b/nipype/interfaces/semtools/tests/test_auto_GenerateCsfClippedFromClassifiedImage.py index ac8ae0efeb..1cdeab73f7 100644 --- a/nipype/interfaces/semtools/tests/test_auto_GenerateCsfClippedFromClassifiedImage.py +++ b/nipype/interfaces/semtools/tests/test_auto_GenerateCsfClippedFromClassifiedImage.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..featurecreator import GenerateCsfClippedFromClassifiedImage diff --git a/nipype/interfaces/semtools/utilities/__init__.py b/nipype/interfaces/semtools/utilities/__init__.py index 698b76a534..b59f373cf9 100644 --- a/nipype/interfaces/semtools/utilities/__init__.py +++ b/nipype/interfaces/semtools/utilities/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .brains import ( BRAINSConstellationModeler, landmarksConstellationWeights, BRAINSTrimForegroundInDirection, BRAINSLmkTransform, BRAINSMush, diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSAlignMSP.py b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSAlignMSP.py index 5db3d12da1..b5913daba3 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSAlignMSP.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSAlignMSP.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import BRAINSAlignMSP diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSClipInferior.py b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSClipInferior.py index 1585e4152d..39fb8fe023 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSClipInferior.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSClipInferior.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import BRAINSClipInferior diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSConstellationModeler.py b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSConstellationModeler.py index 38eba27d7e..0edcebc668 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSConstellationModeler.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSConstellationModeler.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import BRAINSConstellationModeler diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSEyeDetector.py b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSEyeDetector.py index 0d9179f13f..9c1fe4a993 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSEyeDetector.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSEyeDetector.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import BRAINSEyeDetector diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSInitializedControlPoints.py b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSInitializedControlPoints.py index 46aac4e578..66accefbee 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSInitializedControlPoints.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSInitializedControlPoints.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import BRAINSInitializedControlPoints diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSLandmarkInitializer.py b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSLandmarkInitializer.py index 172e076e6e..dd39f41295 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSLandmarkInitializer.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSLandmarkInitializer.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import BRAINSLandmarkInitializer diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSLinearModelerEPCA.py b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSLinearModelerEPCA.py index 1dc026f988..6692e342a0 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSLinearModelerEPCA.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSLinearModelerEPCA.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import BRAINSLinearModelerEPCA diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSLmkTransform.py b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSLmkTransform.py index 876ab830c5..88b0846768 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSLmkTransform.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSLmkTransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import BRAINSLmkTransform diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSMush.py b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSMush.py index cb612ee8f2..a1bde9d454 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSMush.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSMush.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import BRAINSMush diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSSnapShotWriter.py b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSSnapShotWriter.py index 573252e1fc..2118b58ed9 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSSnapShotWriter.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSSnapShotWriter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import BRAINSSnapShotWriter diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSTransformConvert.py b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSTransformConvert.py index 29309f53b0..6abf0a9f3f 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSTransformConvert.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSTransformConvert.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import BRAINSTransformConvert diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSTrimForegroundInDirection.py b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSTrimForegroundInDirection.py index 0bb8f0a13b..2bf13debc4 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSTrimForegroundInDirection.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_BRAINSTrimForegroundInDirection.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import BRAINSTrimForegroundInDirection diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_CleanUpOverlapLabels.py b/nipype/interfaces/semtools/utilities/tests/test_auto_CleanUpOverlapLabels.py index 936437886a..fe56cb0e38 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_CleanUpOverlapLabels.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_CleanUpOverlapLabels.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import CleanUpOverlapLabels diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_FindCenterOfBrain.py b/nipype/interfaces/semtools/utilities/tests/test_auto_FindCenterOfBrain.py index 339f9a19ba..701eb2438e 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_FindCenterOfBrain.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_FindCenterOfBrain.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import FindCenterOfBrain diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_GenerateLabelMapFromProbabilityMap.py b/nipype/interfaces/semtools/utilities/tests/test_auto_GenerateLabelMapFromProbabilityMap.py index caf6323e68..f2a89bbe6a 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_GenerateLabelMapFromProbabilityMap.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_GenerateLabelMapFromProbabilityMap.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import GenerateLabelMapFromProbabilityMap diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_ImageRegionPlotter.py b/nipype/interfaces/semtools/utilities/tests/test_auto_ImageRegionPlotter.py index 3cc1740778..e51aa52502 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_ImageRegionPlotter.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_ImageRegionPlotter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import ImageRegionPlotter diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_JointHistogram.py b/nipype/interfaces/semtools/utilities/tests/test_auto_JointHistogram.py index c686badea2..ec583132b6 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_JointHistogram.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_JointHistogram.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import JointHistogram diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_ShuffleVectorsModule.py b/nipype/interfaces/semtools/utilities/tests/test_auto_ShuffleVectorsModule.py index 1f50a296ab..3343270e9d 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_ShuffleVectorsModule.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_ShuffleVectorsModule.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import ShuffleVectorsModule diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_fcsv_to_hdf5.py b/nipype/interfaces/semtools/utilities/tests/test_auto_fcsv_to_hdf5.py index 2134ec42f0..afd2d091ce 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_fcsv_to_hdf5.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_fcsv_to_hdf5.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import fcsv_to_hdf5 diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_insertMidACPCpoint.py b/nipype/interfaces/semtools/utilities/tests/test_auto_insertMidACPCpoint.py index 042194c5ea..fa2335fed6 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_insertMidACPCpoint.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_insertMidACPCpoint.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import insertMidACPCpoint diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_landmarksConstellationAligner.py b/nipype/interfaces/semtools/utilities/tests/test_auto_landmarksConstellationAligner.py index 860a0a972e..098cdfa613 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_landmarksConstellationAligner.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_landmarksConstellationAligner.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import landmarksConstellationAligner diff --git a/nipype/interfaces/semtools/utilities/tests/test_auto_landmarksConstellationWeights.py b/nipype/interfaces/semtools/utilities/tests/test_auto_landmarksConstellationWeights.py index 689c78de76..702f8b6266 100644 --- a/nipype/interfaces/semtools/utilities/tests/test_auto_landmarksConstellationWeights.py +++ b/nipype/interfaces/semtools/utilities/tests/test_auto_landmarksConstellationWeights.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brains import landmarksConstellationWeights diff --git a/nipype/interfaces/slicer/__init__.py b/nipype/interfaces/slicer/__init__.py index c7ffc42259..5198d81be3 100644 --- a/nipype/interfaces/slicer/__init__.py +++ b/nipype/interfaces/slicer/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .diffusion import * from .segmentation import * from .filtering import * diff --git a/nipype/interfaces/slicer/diffusion/__init__.py b/nipype/interfaces/slicer/diffusion/__init__.py index fd7231cefe..f6081f6c0c 100644 --- a/nipype/interfaces/slicer/diffusion/__init__.py +++ b/nipype/interfaces/slicer/diffusion/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .diffusion import ( ResampleDTIVolume, DWIRicianLMMSEFilter, TractographyLabelMapSeeding, DWIJointRicianLMMSEFilter, DiffusionWeightedVolumeMasking, DTIimport, diff --git a/nipype/interfaces/slicer/diffusion/tests/test_auto_DTIexport.py b/nipype/interfaces/slicer/diffusion/tests/test_auto_DTIexport.py index 33e52ed707..5b72027e1a 100644 --- a/nipype/interfaces/slicer/diffusion/tests/test_auto_DTIexport.py +++ b/nipype/interfaces/slicer/diffusion/tests/test_auto_DTIexport.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..diffusion import DTIexport diff --git a/nipype/interfaces/slicer/diffusion/tests/test_auto_DTIimport.py b/nipype/interfaces/slicer/diffusion/tests/test_auto_DTIimport.py index ddb07c9428..9b9c5f1929 100644 --- a/nipype/interfaces/slicer/diffusion/tests/test_auto_DTIimport.py +++ b/nipype/interfaces/slicer/diffusion/tests/test_auto_DTIimport.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..diffusion import DTIimport diff --git a/nipype/interfaces/slicer/diffusion/tests/test_auto_DWIJointRicianLMMSEFilter.py b/nipype/interfaces/slicer/diffusion/tests/test_auto_DWIJointRicianLMMSEFilter.py index aa0b6f97b5..186014c407 100644 --- a/nipype/interfaces/slicer/diffusion/tests/test_auto_DWIJointRicianLMMSEFilter.py +++ b/nipype/interfaces/slicer/diffusion/tests/test_auto_DWIJointRicianLMMSEFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..diffusion import DWIJointRicianLMMSEFilter diff --git a/nipype/interfaces/slicer/diffusion/tests/test_auto_DWIRicianLMMSEFilter.py b/nipype/interfaces/slicer/diffusion/tests/test_auto_DWIRicianLMMSEFilter.py index 69509fcf28..1c488f912f 100644 --- a/nipype/interfaces/slicer/diffusion/tests/test_auto_DWIRicianLMMSEFilter.py +++ b/nipype/interfaces/slicer/diffusion/tests/test_auto_DWIRicianLMMSEFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..diffusion import DWIRicianLMMSEFilter diff --git a/nipype/interfaces/slicer/diffusion/tests/test_auto_DWIToDTIEstimation.py b/nipype/interfaces/slicer/diffusion/tests/test_auto_DWIToDTIEstimation.py index 4f9702bb32..87a1300476 100644 --- a/nipype/interfaces/slicer/diffusion/tests/test_auto_DWIToDTIEstimation.py +++ b/nipype/interfaces/slicer/diffusion/tests/test_auto_DWIToDTIEstimation.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..diffusion import DWIToDTIEstimation diff --git a/nipype/interfaces/slicer/diffusion/tests/test_auto_DiffusionTensorScalarMeasurements.py b/nipype/interfaces/slicer/diffusion/tests/test_auto_DiffusionTensorScalarMeasurements.py index 060c47ecc2..44b5d9228b 100644 --- a/nipype/interfaces/slicer/diffusion/tests/test_auto_DiffusionTensorScalarMeasurements.py +++ b/nipype/interfaces/slicer/diffusion/tests/test_auto_DiffusionTensorScalarMeasurements.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..diffusion import DiffusionTensorScalarMeasurements diff --git a/nipype/interfaces/slicer/diffusion/tests/test_auto_DiffusionWeightedVolumeMasking.py b/nipype/interfaces/slicer/diffusion/tests/test_auto_DiffusionWeightedVolumeMasking.py index e023e6293c..fdd979678e 100644 --- a/nipype/interfaces/slicer/diffusion/tests/test_auto_DiffusionWeightedVolumeMasking.py +++ b/nipype/interfaces/slicer/diffusion/tests/test_auto_DiffusionWeightedVolumeMasking.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..diffusion import DiffusionWeightedVolumeMasking diff --git a/nipype/interfaces/slicer/diffusion/tests/test_auto_ResampleDTIVolume.py b/nipype/interfaces/slicer/diffusion/tests/test_auto_ResampleDTIVolume.py index 9cfcdb14fb..1933c1d674 100644 --- a/nipype/interfaces/slicer/diffusion/tests/test_auto_ResampleDTIVolume.py +++ b/nipype/interfaces/slicer/diffusion/tests/test_auto_ResampleDTIVolume.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..diffusion import ResampleDTIVolume diff --git a/nipype/interfaces/slicer/diffusion/tests/test_auto_TractographyLabelMapSeeding.py b/nipype/interfaces/slicer/diffusion/tests/test_auto_TractographyLabelMapSeeding.py index 09fef7d133..e14bfeece8 100644 --- a/nipype/interfaces/slicer/diffusion/tests/test_auto_TractographyLabelMapSeeding.py +++ b/nipype/interfaces/slicer/diffusion/tests/test_auto_TractographyLabelMapSeeding.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..diffusion import TractographyLabelMapSeeding diff --git a/nipype/interfaces/slicer/filtering/__init__.py b/nipype/interfaces/slicer/filtering/__init__.py index 30ace1d2f2..1270e20d26 100644 --- a/nipype/interfaces/slicer/filtering/__init__.py +++ b/nipype/interfaces/slicer/filtering/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .morphology import (GrayscaleGrindPeakImageFilter, GrayscaleFillHoleImageFilter) from .denoising import (GradientAnisotropicDiffusion, diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_AddScalarVolumes.py b/nipype/interfaces/slicer/filtering/tests/test_auto_AddScalarVolumes.py index 42a7b17a19..cd05a91d05 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_AddScalarVolumes.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_AddScalarVolumes.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..arithmetic import AddScalarVolumes diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_CastScalarVolume.py b/nipype/interfaces/slicer/filtering/tests/test_auto_CastScalarVolume.py index 0c05002ff8..6ed35e0df7 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_CastScalarVolume.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_CastScalarVolume.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..arithmetic import CastScalarVolume diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_CheckerBoardFilter.py b/nipype/interfaces/slicer/filtering/tests/test_auto_CheckerBoardFilter.py index b602012d0c..9ad8894a35 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_CheckerBoardFilter.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_CheckerBoardFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..checkerboardfilter import CheckerBoardFilter diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_CurvatureAnisotropicDiffusion.py b/nipype/interfaces/slicer/filtering/tests/test_auto_CurvatureAnisotropicDiffusion.py index 7389aa0cee..0dd2a4f946 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_CurvatureAnisotropicDiffusion.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_CurvatureAnisotropicDiffusion.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..denoising import CurvatureAnisotropicDiffusion diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_ExtractSkeleton.py b/nipype/interfaces/slicer/filtering/tests/test_auto_ExtractSkeleton.py index d6f93cb41d..f3b027c12e 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_ExtractSkeleton.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_ExtractSkeleton.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..extractskeleton import ExtractSkeleton diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_GaussianBlurImageFilter.py b/nipype/interfaces/slicer/filtering/tests/test_auto_GaussianBlurImageFilter.py index 9511f9ce1d..5e01ce71cc 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_GaussianBlurImageFilter.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_GaussianBlurImageFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..denoising import GaussianBlurImageFilter diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_GradientAnisotropicDiffusion.py b/nipype/interfaces/slicer/filtering/tests/test_auto_GradientAnisotropicDiffusion.py index 02c9d7fb20..3d803b9222 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_GradientAnisotropicDiffusion.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_GradientAnisotropicDiffusion.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..denoising import GradientAnisotropicDiffusion diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_GrayscaleFillHoleImageFilter.py b/nipype/interfaces/slicer/filtering/tests/test_auto_GrayscaleFillHoleImageFilter.py index 45b2b4b8dc..2d9bf34805 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_GrayscaleFillHoleImageFilter.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_GrayscaleFillHoleImageFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..morphology import GrayscaleFillHoleImageFilter diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_GrayscaleGrindPeakImageFilter.py b/nipype/interfaces/slicer/filtering/tests/test_auto_GrayscaleGrindPeakImageFilter.py index 77536e147d..ad1a04aff7 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_GrayscaleGrindPeakImageFilter.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_GrayscaleGrindPeakImageFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..morphology import GrayscaleGrindPeakImageFilter diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_HistogramMatching.py b/nipype/interfaces/slicer/filtering/tests/test_auto_HistogramMatching.py index 9541702731..3ace435981 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_HistogramMatching.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_HistogramMatching.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..histogrammatching import HistogramMatching diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_ImageLabelCombine.py b/nipype/interfaces/slicer/filtering/tests/test_auto_ImageLabelCombine.py index c3373f80ec..ec9a2bd0b2 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_ImageLabelCombine.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_ImageLabelCombine.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..imagelabelcombine import ImageLabelCombine diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_MaskScalarVolume.py b/nipype/interfaces/slicer/filtering/tests/test_auto_MaskScalarVolume.py index 11999f2001..17c20d18dc 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_MaskScalarVolume.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_MaskScalarVolume.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..arithmetic import MaskScalarVolume diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_MedianImageFilter.py b/nipype/interfaces/slicer/filtering/tests/test_auto_MedianImageFilter.py index 4c890aa30f..d02373d1c9 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_MedianImageFilter.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_MedianImageFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..denoising import MedianImageFilter diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_MultiplyScalarVolumes.py b/nipype/interfaces/slicer/filtering/tests/test_auto_MultiplyScalarVolumes.py index 99772b41db..95ac2f98a4 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_MultiplyScalarVolumes.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_MultiplyScalarVolumes.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..arithmetic import MultiplyScalarVolumes diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_N4ITKBiasFieldCorrection.py b/nipype/interfaces/slicer/filtering/tests/test_auto_N4ITKBiasFieldCorrection.py index b2ce50a0fa..0938eab33c 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_N4ITKBiasFieldCorrection.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_N4ITKBiasFieldCorrection.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..n4itkbiasfieldcorrection import N4ITKBiasFieldCorrection diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_ResampleScalarVectorDWIVolume.py b/nipype/interfaces/slicer/filtering/tests/test_auto_ResampleScalarVectorDWIVolume.py index 28a9876943..2e95aaf01e 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_ResampleScalarVectorDWIVolume.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_ResampleScalarVectorDWIVolume.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..resamplescalarvectordwivolume import ResampleScalarVectorDWIVolume diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_SubtractScalarVolumes.py b/nipype/interfaces/slicer/filtering/tests/test_auto_SubtractScalarVolumes.py index 62bf214bf4..70d8908ce0 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_SubtractScalarVolumes.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_SubtractScalarVolumes.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..arithmetic import SubtractScalarVolumes diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_ThresholdScalarVolume.py b/nipype/interfaces/slicer/filtering/tests/test_auto_ThresholdScalarVolume.py index ce7f97ec58..51e7d1726d 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_ThresholdScalarVolume.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_ThresholdScalarVolume.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..thresholdscalarvolume import ThresholdScalarVolume diff --git a/nipype/interfaces/slicer/filtering/tests/test_auto_VotingBinaryHoleFillingImageFilter.py b/nipype/interfaces/slicer/filtering/tests/test_auto_VotingBinaryHoleFillingImageFilter.py index c8100fd74b..3ab237831e 100644 --- a/nipype/interfaces/slicer/filtering/tests/test_auto_VotingBinaryHoleFillingImageFilter.py +++ b/nipype/interfaces/slicer/filtering/tests/test_auto_VotingBinaryHoleFillingImageFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..votingbinaryholefillingimagefilter import VotingBinaryHoleFillingImageFilter diff --git a/nipype/interfaces/slicer/generate_classes.py b/nipype/interfaces/slicer/generate_classes.py index 6fe3ae927f..371c957acd 100644 --- a/nipype/interfaces/slicer/generate_classes.py +++ b/nipype/interfaces/slicer/generate_classes.py @@ -3,9 +3,6 @@ modules are selected from the hardcoded list below and generated code is placed in the cli_modules.py file (and imported in __init__.py). For this to work correctly you must have your CLI executabes in $PATH""" -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import str, bytes, open import xml.dom.minidom import subprocess import os @@ -39,8 +36,7 @@ def add_class_to_package(class_codes, class_names, module_name, package_dir): \"\"\"Autogenerated file - DO NOT EDIT If you spot a bug, please report it on the mailing list and/or change the generator.\"\"\"\n\n""" ) - imports = """from __future__ import (print_function, division, unicode_literals, - absolute_import) + imports = """\ from ..base import (CommandLine, CommandLineInputSpec, SEMLikeCommandLine, TraitedSpec, File, Directory, traits, isdefined, InputMultiPath, OutputMultiPath) import os\n\n\n""" diff --git a/nipype/interfaces/slicer/legacy/__init__.py b/nipype/interfaces/slicer/legacy/__init__.py index 75c6b9d327..92cbc1ff73 100644 --- a/nipype/interfaces/slicer/legacy/__init__.py +++ b/nipype/interfaces/slicer/legacy/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .diffusion import * from .segmentation import OtsuThresholdSegmentation from .filtering import OtsuThresholdImageFilter, ResampleScalarVolume diff --git a/nipype/interfaces/slicer/legacy/diffusion/__init__.py b/nipype/interfaces/slicer/legacy/diffusion/__init__.py index f66daabb5b..9a9143d214 100644 --- a/nipype/interfaces/slicer/legacy/diffusion/__init__.py +++ b/nipype/interfaces/slicer/legacy/diffusion/__init__.py @@ -1,3 +1,2 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .denoising import DWIUnbiasedNonLocalMeansFilter diff --git a/nipype/interfaces/slicer/legacy/diffusion/tests/test_auto_DWIUnbiasedNonLocalMeansFilter.py b/nipype/interfaces/slicer/legacy/diffusion/tests/test_auto_DWIUnbiasedNonLocalMeansFilter.py index a121f85614..0be53e7afc 100644 --- a/nipype/interfaces/slicer/legacy/diffusion/tests/test_auto_DWIUnbiasedNonLocalMeansFilter.py +++ b/nipype/interfaces/slicer/legacy/diffusion/tests/test_auto_DWIUnbiasedNonLocalMeansFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..denoising import DWIUnbiasedNonLocalMeansFilter diff --git a/nipype/interfaces/slicer/legacy/tests/test_auto_AffineRegistration.py b/nipype/interfaces/slicer/legacy/tests/test_auto_AffineRegistration.py index 059e7ee694..2ca1242922 100644 --- a/nipype/interfaces/slicer/legacy/tests/test_auto_AffineRegistration.py +++ b/nipype/interfaces/slicer/legacy/tests/test_auto_AffineRegistration.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import AffineRegistration diff --git a/nipype/interfaces/slicer/legacy/tests/test_auto_BSplineDeformableRegistration.py b/nipype/interfaces/slicer/legacy/tests/test_auto_BSplineDeformableRegistration.py index bee2d60af6..889992c9ec 100644 --- a/nipype/interfaces/slicer/legacy/tests/test_auto_BSplineDeformableRegistration.py +++ b/nipype/interfaces/slicer/legacy/tests/test_auto_BSplineDeformableRegistration.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import BSplineDeformableRegistration diff --git a/nipype/interfaces/slicer/legacy/tests/test_auto_BSplineToDeformationField.py b/nipype/interfaces/slicer/legacy/tests/test_auto_BSplineToDeformationField.py index cba80ed391..54dd8157f1 100644 --- a/nipype/interfaces/slicer/legacy/tests/test_auto_BSplineToDeformationField.py +++ b/nipype/interfaces/slicer/legacy/tests/test_auto_BSplineToDeformationField.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..converters import BSplineToDeformationField diff --git a/nipype/interfaces/slicer/legacy/tests/test_auto_ExpertAutomatedRegistration.py b/nipype/interfaces/slicer/legacy/tests/test_auto_ExpertAutomatedRegistration.py index 8cf4622906..8289fc924b 100644 --- a/nipype/interfaces/slicer/legacy/tests/test_auto_ExpertAutomatedRegistration.py +++ b/nipype/interfaces/slicer/legacy/tests/test_auto_ExpertAutomatedRegistration.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import ExpertAutomatedRegistration diff --git a/nipype/interfaces/slicer/legacy/tests/test_auto_LinearRegistration.py b/nipype/interfaces/slicer/legacy/tests/test_auto_LinearRegistration.py index 50a9f2b292..454f645088 100644 --- a/nipype/interfaces/slicer/legacy/tests/test_auto_LinearRegistration.py +++ b/nipype/interfaces/slicer/legacy/tests/test_auto_LinearRegistration.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import LinearRegistration diff --git a/nipype/interfaces/slicer/legacy/tests/test_auto_MultiResolutionAffineRegistration.py b/nipype/interfaces/slicer/legacy/tests/test_auto_MultiResolutionAffineRegistration.py index f6cfc49710..605db755f6 100644 --- a/nipype/interfaces/slicer/legacy/tests/test_auto_MultiResolutionAffineRegistration.py +++ b/nipype/interfaces/slicer/legacy/tests/test_auto_MultiResolutionAffineRegistration.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import MultiResolutionAffineRegistration diff --git a/nipype/interfaces/slicer/legacy/tests/test_auto_OtsuThresholdImageFilter.py b/nipype/interfaces/slicer/legacy/tests/test_auto_OtsuThresholdImageFilter.py index 6af3c1d54c..50782aec03 100644 --- a/nipype/interfaces/slicer/legacy/tests/test_auto_OtsuThresholdImageFilter.py +++ b/nipype/interfaces/slicer/legacy/tests/test_auto_OtsuThresholdImageFilter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..filtering import OtsuThresholdImageFilter diff --git a/nipype/interfaces/slicer/legacy/tests/test_auto_OtsuThresholdSegmentation.py b/nipype/interfaces/slicer/legacy/tests/test_auto_OtsuThresholdSegmentation.py index c73313751e..5340c37639 100644 --- a/nipype/interfaces/slicer/legacy/tests/test_auto_OtsuThresholdSegmentation.py +++ b/nipype/interfaces/slicer/legacy/tests/test_auto_OtsuThresholdSegmentation.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..segmentation import OtsuThresholdSegmentation diff --git a/nipype/interfaces/slicer/legacy/tests/test_auto_ResampleScalarVolume.py b/nipype/interfaces/slicer/legacy/tests/test_auto_ResampleScalarVolume.py index 66207fb604..49c2ac2ffb 100644 --- a/nipype/interfaces/slicer/legacy/tests/test_auto_ResampleScalarVolume.py +++ b/nipype/interfaces/slicer/legacy/tests/test_auto_ResampleScalarVolume.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..filtering import ResampleScalarVolume diff --git a/nipype/interfaces/slicer/legacy/tests/test_auto_RigidRegistration.py b/nipype/interfaces/slicer/legacy/tests/test_auto_RigidRegistration.py index 1c29d1295a..92a8af7dfb 100644 --- a/nipype/interfaces/slicer/legacy/tests/test_auto_RigidRegistration.py +++ b/nipype/interfaces/slicer/legacy/tests/test_auto_RigidRegistration.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..registration import RigidRegistration diff --git a/nipype/interfaces/slicer/quantification/__init__.py b/nipype/interfaces/slicer/quantification/__init__.py index 6054dddd59..c0e1e870e7 100644 --- a/nipype/interfaces/slicer/quantification/__init__.py +++ b/nipype/interfaces/slicer/quantification/__init__.py @@ -1,4 +1,3 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .changequantification import IntensityDifferenceMetric from .petstandarduptakevaluecomputation import PETStandardUptakeValueComputation diff --git a/nipype/interfaces/slicer/quantification/tests/test_auto_IntensityDifferenceMetric.py b/nipype/interfaces/slicer/quantification/tests/test_auto_IntensityDifferenceMetric.py index 386e368de7..6462d2ff48 100644 --- a/nipype/interfaces/slicer/quantification/tests/test_auto_IntensityDifferenceMetric.py +++ b/nipype/interfaces/slicer/quantification/tests/test_auto_IntensityDifferenceMetric.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..changequantification import IntensityDifferenceMetric diff --git a/nipype/interfaces/slicer/quantification/tests/test_auto_PETStandardUptakeValueComputation.py b/nipype/interfaces/slicer/quantification/tests/test_auto_PETStandardUptakeValueComputation.py index 51ae985574..c30fc0c0cf 100644 --- a/nipype/interfaces/slicer/quantification/tests/test_auto_PETStandardUptakeValueComputation.py +++ b/nipype/interfaces/slicer/quantification/tests/test_auto_PETStandardUptakeValueComputation.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..petstandarduptakevaluecomputation import PETStandardUptakeValueComputation diff --git a/nipype/interfaces/slicer/registration/__init__.py b/nipype/interfaces/slicer/registration/__init__.py index 375b9b5416..2d03aabe03 100644 --- a/nipype/interfaces/slicer/registration/__init__.py +++ b/nipype/interfaces/slicer/registration/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .specialized import (ACPCTransform, FiducialRegistration, VBRAINSDemonWarp, BRAINSDemonWarp) from .brainsresample import BRAINSResample diff --git a/nipype/interfaces/slicer/registration/tests/test_auto_ACPCTransform.py b/nipype/interfaces/slicer/registration/tests/test_auto_ACPCTransform.py index c8969b06b7..f60ab0866b 100644 --- a/nipype/interfaces/slicer/registration/tests/test_auto_ACPCTransform.py +++ b/nipype/interfaces/slicer/registration/tests/test_auto_ACPCTransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import ACPCTransform diff --git a/nipype/interfaces/slicer/registration/tests/test_auto_BRAINSDemonWarp.py b/nipype/interfaces/slicer/registration/tests/test_auto_BRAINSDemonWarp.py index 18cd4c63ff..efe6d50fce 100644 --- a/nipype/interfaces/slicer/registration/tests/test_auto_BRAINSDemonWarp.py +++ b/nipype/interfaces/slicer/registration/tests/test_auto_BRAINSDemonWarp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import BRAINSDemonWarp diff --git a/nipype/interfaces/slicer/registration/tests/test_auto_BRAINSFit.py b/nipype/interfaces/slicer/registration/tests/test_auto_BRAINSFit.py index 450dc2ed9b..58c903d144 100644 --- a/nipype/interfaces/slicer/registration/tests/test_auto_BRAINSFit.py +++ b/nipype/interfaces/slicer/registration/tests/test_auto_BRAINSFit.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsfit import BRAINSFit diff --git a/nipype/interfaces/slicer/registration/tests/test_auto_BRAINSResample.py b/nipype/interfaces/slicer/registration/tests/test_auto_BRAINSResample.py index e8d4c187b0..092689442d 100644 --- a/nipype/interfaces/slicer/registration/tests/test_auto_BRAINSResample.py +++ b/nipype/interfaces/slicer/registration/tests/test_auto_BRAINSResample.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..brainsresample import BRAINSResample diff --git a/nipype/interfaces/slicer/registration/tests/test_auto_FiducialRegistration.py b/nipype/interfaces/slicer/registration/tests/test_auto_FiducialRegistration.py index d190957049..e3e7124535 100644 --- a/nipype/interfaces/slicer/registration/tests/test_auto_FiducialRegistration.py +++ b/nipype/interfaces/slicer/registration/tests/test_auto_FiducialRegistration.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import FiducialRegistration diff --git a/nipype/interfaces/slicer/registration/tests/test_auto_VBRAINSDemonWarp.py b/nipype/interfaces/slicer/registration/tests/test_auto_VBRAINSDemonWarp.py index b196d318d4..fb0a3dd88e 100644 --- a/nipype/interfaces/slicer/registration/tests/test_auto_VBRAINSDemonWarp.py +++ b/nipype/interfaces/slicer/registration/tests/test_auto_VBRAINSDemonWarp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import VBRAINSDemonWarp diff --git a/nipype/interfaces/slicer/segmentation/__init__.py b/nipype/interfaces/slicer/segmentation/__init__.py index d966f07e27..5b3cf6d468 100644 --- a/nipype/interfaces/slicer/segmentation/__init__.py +++ b/nipype/interfaces/slicer/segmentation/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .specialized import (RobustStatisticsSegmenter, EMSegmentCommandLine, BRAINSROIAuto) from .simpleregiongrowingsegmentation import SimpleRegionGrowingSegmentation diff --git a/nipype/interfaces/slicer/segmentation/tests/test_auto_BRAINSROIAuto.py b/nipype/interfaces/slicer/segmentation/tests/test_auto_BRAINSROIAuto.py index 8d56bade08..57959c7102 100644 --- a/nipype/interfaces/slicer/segmentation/tests/test_auto_BRAINSROIAuto.py +++ b/nipype/interfaces/slicer/segmentation/tests/test_auto_BRAINSROIAuto.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import BRAINSROIAuto diff --git a/nipype/interfaces/slicer/segmentation/tests/test_auto_EMSegmentCommandLine.py b/nipype/interfaces/slicer/segmentation/tests/test_auto_EMSegmentCommandLine.py index f5b7a28b99..30a0ab2ade 100644 --- a/nipype/interfaces/slicer/segmentation/tests/test_auto_EMSegmentCommandLine.py +++ b/nipype/interfaces/slicer/segmentation/tests/test_auto_EMSegmentCommandLine.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import EMSegmentCommandLine diff --git a/nipype/interfaces/slicer/segmentation/tests/test_auto_RobustStatisticsSegmenter.py b/nipype/interfaces/slicer/segmentation/tests/test_auto_RobustStatisticsSegmenter.py index c956ae34ec..4d9bbee882 100644 --- a/nipype/interfaces/slicer/segmentation/tests/test_auto_RobustStatisticsSegmenter.py +++ b/nipype/interfaces/slicer/segmentation/tests/test_auto_RobustStatisticsSegmenter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..specialized import RobustStatisticsSegmenter diff --git a/nipype/interfaces/slicer/segmentation/tests/test_auto_SimpleRegionGrowingSegmentation.py b/nipype/interfaces/slicer/segmentation/tests/test_auto_SimpleRegionGrowingSegmentation.py index 8ffdd04355..2d3fe30de5 100644 --- a/nipype/interfaces/slicer/segmentation/tests/test_auto_SimpleRegionGrowingSegmentation.py +++ b/nipype/interfaces/slicer/segmentation/tests/test_auto_SimpleRegionGrowingSegmentation.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..simpleregiongrowingsegmentation import SimpleRegionGrowingSegmentation diff --git a/nipype/interfaces/slicer/tests/test_auto_DicomToNrrdConverter.py b/nipype/interfaces/slicer/tests/test_auto_DicomToNrrdConverter.py index 2997e805f9..3e6b0d875d 100644 --- a/nipype/interfaces/slicer/tests/test_auto_DicomToNrrdConverter.py +++ b/nipype/interfaces/slicer/tests/test_auto_DicomToNrrdConverter.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..converters import DicomToNrrdConverter diff --git a/nipype/interfaces/slicer/tests/test_auto_EMSegmentTransformToNewFormat.py b/nipype/interfaces/slicer/tests/test_auto_EMSegmentTransformToNewFormat.py index 8494a85837..371d7cb1b3 100644 --- a/nipype/interfaces/slicer/tests/test_auto_EMSegmentTransformToNewFormat.py +++ b/nipype/interfaces/slicer/tests/test_auto_EMSegmentTransformToNewFormat.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utilities import EMSegmentTransformToNewFormat diff --git a/nipype/interfaces/slicer/tests/test_auto_GrayscaleModelMaker.py b/nipype/interfaces/slicer/tests/test_auto_GrayscaleModelMaker.py index e18c0f0d5d..9b9cb3b367 100644 --- a/nipype/interfaces/slicer/tests/test_auto_GrayscaleModelMaker.py +++ b/nipype/interfaces/slicer/tests/test_auto_GrayscaleModelMaker.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..surface import GrayscaleModelMaker diff --git a/nipype/interfaces/slicer/tests/test_auto_LabelMapSmoothing.py b/nipype/interfaces/slicer/tests/test_auto_LabelMapSmoothing.py index d196dbf5d8..c33abad34c 100644 --- a/nipype/interfaces/slicer/tests/test_auto_LabelMapSmoothing.py +++ b/nipype/interfaces/slicer/tests/test_auto_LabelMapSmoothing.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..surface import LabelMapSmoothing diff --git a/nipype/interfaces/slicer/tests/test_auto_MergeModels.py b/nipype/interfaces/slicer/tests/test_auto_MergeModels.py index 2e09b69bd1..86fdd83399 100644 --- a/nipype/interfaces/slicer/tests/test_auto_MergeModels.py +++ b/nipype/interfaces/slicer/tests/test_auto_MergeModels.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..surface import MergeModels diff --git a/nipype/interfaces/slicer/tests/test_auto_ModelMaker.py b/nipype/interfaces/slicer/tests/test_auto_ModelMaker.py index 164034a4e7..ef6a3f3c0d 100644 --- a/nipype/interfaces/slicer/tests/test_auto_ModelMaker.py +++ b/nipype/interfaces/slicer/tests/test_auto_ModelMaker.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..surface import ModelMaker diff --git a/nipype/interfaces/slicer/tests/test_auto_ModelToLabelMap.py b/nipype/interfaces/slicer/tests/test_auto_ModelToLabelMap.py index 2e684e3e65..8c53d9dabe 100644 --- a/nipype/interfaces/slicer/tests/test_auto_ModelToLabelMap.py +++ b/nipype/interfaces/slicer/tests/test_auto_ModelToLabelMap.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..surface import ModelToLabelMap diff --git a/nipype/interfaces/slicer/tests/test_auto_OrientScalarVolume.py b/nipype/interfaces/slicer/tests/test_auto_OrientScalarVolume.py index 479bb842bb..4e61a5c819 100644 --- a/nipype/interfaces/slicer/tests/test_auto_OrientScalarVolume.py +++ b/nipype/interfaces/slicer/tests/test_auto_OrientScalarVolume.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..converters import OrientScalarVolume diff --git a/nipype/interfaces/slicer/tests/test_auto_ProbeVolumeWithModel.py b/nipype/interfaces/slicer/tests/test_auto_ProbeVolumeWithModel.py index b4bbdbe283..98b572e4c8 100644 --- a/nipype/interfaces/slicer/tests/test_auto_ProbeVolumeWithModel.py +++ b/nipype/interfaces/slicer/tests/test_auto_ProbeVolumeWithModel.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..surface import ProbeVolumeWithModel diff --git a/nipype/interfaces/slicer/tests/test_auto_SlicerCommandLine.py b/nipype/interfaces/slicer/tests/test_auto_SlicerCommandLine.py index b0e1e2c3b0..b8eeb5bd56 100644 --- a/nipype/interfaces/slicer/tests/test_auto_SlicerCommandLine.py +++ b/nipype/interfaces/slicer/tests/test_auto_SlicerCommandLine.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import SlicerCommandLine diff --git a/nipype/interfaces/spm/base.py b/nipype/interfaces/spm/base.py index 08a31d8185..785e069c04 100644 --- a/nipype/interfaces/spm/base.py +++ b/nipype/interfaces/spm/base.py @@ -14,10 +14,6 @@ spm.SPMCommand().version """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range, object, str, bytes - # Standard library imports import os from copy import deepcopy diff --git a/nipype/interfaces/spm/model.py b/nipype/interfaces/spm/model.py index 4fb1c51e08..4a1d4c80a2 100644 --- a/nipype/interfaces/spm/model.py +++ b/nipype/interfaces/spm/model.py @@ -4,10 +4,6 @@ """The spm module provides basic functions for interfacing with matlab and spm to access spm tools. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import str, bytes - # Standard library imports import os from glob import glob diff --git a/nipype/interfaces/spm/preprocess.py b/nipype/interfaces/spm/preprocess.py index 08bc62fe7a..5c63936b09 100644 --- a/nipype/interfaces/spm/preprocess.py +++ b/nipype/interfaces/spm/preprocess.py @@ -3,10 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """SPM wrappers for preprocessing data """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range - import os from copy import deepcopy diff --git a/nipype/interfaces/spm/tests/test_auto_Analyze2nii.py b/nipype/interfaces/spm/tests/test_auto_Analyze2nii.py index 25b577ff96..92ca0baf27 100644 --- a/nipype/interfaces/spm/tests/test_auto_Analyze2nii.py +++ b/nipype/interfaces/spm/tests/test_auto_Analyze2nii.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Analyze2nii diff --git a/nipype/interfaces/spm/tests/test_auto_ApplyDeformations.py b/nipype/interfaces/spm/tests/test_auto_ApplyDeformations.py index a9f652ba6d..8d7c371f40 100644 --- a/nipype/interfaces/spm/tests/test_auto_ApplyDeformations.py +++ b/nipype/interfaces/spm/tests/test_auto_ApplyDeformations.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import ApplyDeformations diff --git a/nipype/interfaces/spm/tests/test_auto_ApplyInverseDeformation.py b/nipype/interfaces/spm/tests/test_auto_ApplyInverseDeformation.py index b2be189f03..270fc8cb75 100644 --- a/nipype/interfaces/spm/tests/test_auto_ApplyInverseDeformation.py +++ b/nipype/interfaces/spm/tests/test_auto_ApplyInverseDeformation.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ApplyInverseDeformation diff --git a/nipype/interfaces/spm/tests/test_auto_ApplyTransform.py b/nipype/interfaces/spm/tests/test_auto_ApplyTransform.py index cfef023fa7..be07ee26ce 100644 --- a/nipype/interfaces/spm/tests/test_auto_ApplyTransform.py +++ b/nipype/interfaces/spm/tests/test_auto_ApplyTransform.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ApplyTransform diff --git a/nipype/interfaces/spm/tests/test_auto_CalcCoregAffine.py b/nipype/interfaces/spm/tests/test_auto_CalcCoregAffine.py index 2da4a64024..a4f7b5b516 100644 --- a/nipype/interfaces/spm/tests/test_auto_CalcCoregAffine.py +++ b/nipype/interfaces/spm/tests/test_auto_CalcCoregAffine.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import CalcCoregAffine diff --git a/nipype/interfaces/spm/tests/test_auto_Coregister.py b/nipype/interfaces/spm/tests/test_auto_Coregister.py index 260c3afc03..276f02c47a 100644 --- a/nipype/interfaces/spm/tests/test_auto_Coregister.py +++ b/nipype/interfaces/spm/tests/test_auto_Coregister.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Coregister diff --git a/nipype/interfaces/spm/tests/test_auto_CreateWarped.py b/nipype/interfaces/spm/tests/test_auto_CreateWarped.py index dd98d30e37..b25e377ad3 100644 --- a/nipype/interfaces/spm/tests/test_auto_CreateWarped.py +++ b/nipype/interfaces/spm/tests/test_auto_CreateWarped.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import CreateWarped diff --git a/nipype/interfaces/spm/tests/test_auto_DARTEL.py b/nipype/interfaces/spm/tests/test_auto_DARTEL.py index 2cc2485f49..de7eb7e158 100644 --- a/nipype/interfaces/spm/tests/test_auto_DARTEL.py +++ b/nipype/interfaces/spm/tests/test_auto_DARTEL.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import DARTEL diff --git a/nipype/interfaces/spm/tests/test_auto_DARTELNorm2MNI.py b/nipype/interfaces/spm/tests/test_auto_DARTELNorm2MNI.py index e4818e8b58..9870b2b55b 100644 --- a/nipype/interfaces/spm/tests/test_auto_DARTELNorm2MNI.py +++ b/nipype/interfaces/spm/tests/test_auto_DARTELNorm2MNI.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import DARTELNorm2MNI diff --git a/nipype/interfaces/spm/tests/test_auto_DicomImport.py b/nipype/interfaces/spm/tests/test_auto_DicomImport.py index fec62ddeeb..833794b628 100644 --- a/nipype/interfaces/spm/tests/test_auto_DicomImport.py +++ b/nipype/interfaces/spm/tests/test_auto_DicomImport.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import DicomImport diff --git a/nipype/interfaces/spm/tests/test_auto_EstimateContrast.py b/nipype/interfaces/spm/tests/test_auto_EstimateContrast.py index 1b2d20bd04..cc2d50f5a7 100644 --- a/nipype/interfaces/spm/tests/test_auto_EstimateContrast.py +++ b/nipype/interfaces/spm/tests/test_auto_EstimateContrast.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import EstimateContrast diff --git a/nipype/interfaces/spm/tests/test_auto_EstimateModel.py b/nipype/interfaces/spm/tests/test_auto_EstimateModel.py index a143366d8f..9893f2bfcb 100644 --- a/nipype/interfaces/spm/tests/test_auto_EstimateModel.py +++ b/nipype/interfaces/spm/tests/test_auto_EstimateModel.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import EstimateModel diff --git a/nipype/interfaces/spm/tests/test_auto_FactorialDesign.py b/nipype/interfaces/spm/tests/test_auto_FactorialDesign.py index 892e1d2694..814cb173fb 100644 --- a/nipype/interfaces/spm/tests/test_auto_FactorialDesign.py +++ b/nipype/interfaces/spm/tests/test_auto_FactorialDesign.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import FactorialDesign diff --git a/nipype/interfaces/spm/tests/test_auto_FieldMap.py b/nipype/interfaces/spm/tests/test_auto_FieldMap.py index a680fbd54e..ad0375e7c8 100644 --- a/nipype/interfaces/spm/tests/test_auto_FieldMap.py +++ b/nipype/interfaces/spm/tests/test_auto_FieldMap.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import FieldMap diff --git a/nipype/interfaces/spm/tests/test_auto_Level1Design.py b/nipype/interfaces/spm/tests/test_auto_Level1Design.py index 10c74f72b8..6d941dbec9 100644 --- a/nipype/interfaces/spm/tests/test_auto_Level1Design.py +++ b/nipype/interfaces/spm/tests/test_auto_Level1Design.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import Level1Design diff --git a/nipype/interfaces/spm/tests/test_auto_MultipleRegressionDesign.py b/nipype/interfaces/spm/tests/test_auto_MultipleRegressionDesign.py index 435c288811..1fdc1d1ff1 100644 --- a/nipype/interfaces/spm/tests/test_auto_MultipleRegressionDesign.py +++ b/nipype/interfaces/spm/tests/test_auto_MultipleRegressionDesign.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import MultipleRegressionDesign diff --git a/nipype/interfaces/spm/tests/test_auto_NewSegment.py b/nipype/interfaces/spm/tests/test_auto_NewSegment.py index 3f03685e11..505296bbf4 100644 --- a/nipype/interfaces/spm/tests/test_auto_NewSegment.py +++ b/nipype/interfaces/spm/tests/test_auto_NewSegment.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import NewSegment diff --git a/nipype/interfaces/spm/tests/test_auto_Normalize.py b/nipype/interfaces/spm/tests/test_auto_Normalize.py index fbf5e278b0..dfa33b5106 100644 --- a/nipype/interfaces/spm/tests/test_auto_Normalize.py +++ b/nipype/interfaces/spm/tests/test_auto_Normalize.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Normalize diff --git a/nipype/interfaces/spm/tests/test_auto_Normalize12.py b/nipype/interfaces/spm/tests/test_auto_Normalize12.py index 25f77519e0..74abdb1d60 100644 --- a/nipype/interfaces/spm/tests/test_auto_Normalize12.py +++ b/nipype/interfaces/spm/tests/test_auto_Normalize12.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Normalize12 diff --git a/nipype/interfaces/spm/tests/test_auto_OneSampleTTestDesign.py b/nipype/interfaces/spm/tests/test_auto_OneSampleTTestDesign.py index d45165957b..552ca0e701 100644 --- a/nipype/interfaces/spm/tests/test_auto_OneSampleTTestDesign.py +++ b/nipype/interfaces/spm/tests/test_auto_OneSampleTTestDesign.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import OneSampleTTestDesign diff --git a/nipype/interfaces/spm/tests/test_auto_PairedTTestDesign.py b/nipype/interfaces/spm/tests/test_auto_PairedTTestDesign.py index 0ad104820e..d8e9ef1615 100644 --- a/nipype/interfaces/spm/tests/test_auto_PairedTTestDesign.py +++ b/nipype/interfaces/spm/tests/test_auto_PairedTTestDesign.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import PairedTTestDesign diff --git a/nipype/interfaces/spm/tests/test_auto_Realign.py b/nipype/interfaces/spm/tests/test_auto_Realign.py index 4812665c78..c65181e277 100644 --- a/nipype/interfaces/spm/tests/test_auto_Realign.py +++ b/nipype/interfaces/spm/tests/test_auto_Realign.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Realign diff --git a/nipype/interfaces/spm/tests/test_auto_RealignUnwarp.py b/nipype/interfaces/spm/tests/test_auto_RealignUnwarp.py index 9517e060d5..85d0ba3d94 100644 --- a/nipype/interfaces/spm/tests/test_auto_RealignUnwarp.py +++ b/nipype/interfaces/spm/tests/test_auto_RealignUnwarp.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import RealignUnwarp diff --git a/nipype/interfaces/spm/tests/test_auto_Reslice.py b/nipype/interfaces/spm/tests/test_auto_Reslice.py index 08a29b0bd7..ca6a89ff67 100644 --- a/nipype/interfaces/spm/tests/test_auto_Reslice.py +++ b/nipype/interfaces/spm/tests/test_auto_Reslice.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import Reslice diff --git a/nipype/interfaces/spm/tests/test_auto_ResliceToReference.py b/nipype/interfaces/spm/tests/test_auto_ResliceToReference.py index 3d5ac6847c..f1ec8393ff 100644 --- a/nipype/interfaces/spm/tests/test_auto_ResliceToReference.py +++ b/nipype/interfaces/spm/tests/test_auto_ResliceToReference.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..utils import ResliceToReference diff --git a/nipype/interfaces/spm/tests/test_auto_SPMCommand.py b/nipype/interfaces/spm/tests/test_auto_SPMCommand.py index 7c1ba5cbc2..32a6b28b5c 100644 --- a/nipype/interfaces/spm/tests/test_auto_SPMCommand.py +++ b/nipype/interfaces/spm/tests/test_auto_SPMCommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import SPMCommand diff --git a/nipype/interfaces/spm/tests/test_auto_Segment.py b/nipype/interfaces/spm/tests/test_auto_Segment.py index 257e7c12ff..c746cd258e 100644 --- a/nipype/interfaces/spm/tests/test_auto_Segment.py +++ b/nipype/interfaces/spm/tests/test_auto_Segment.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Segment diff --git a/nipype/interfaces/spm/tests/test_auto_SliceTiming.py b/nipype/interfaces/spm/tests/test_auto_SliceTiming.py index 85fb1bc4e4..369392b5e9 100644 --- a/nipype/interfaces/spm/tests/test_auto_SliceTiming.py +++ b/nipype/interfaces/spm/tests/test_auto_SliceTiming.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import SliceTiming diff --git a/nipype/interfaces/spm/tests/test_auto_Smooth.py b/nipype/interfaces/spm/tests/test_auto_Smooth.py index eea60ed619..b4e2d42b0f 100644 --- a/nipype/interfaces/spm/tests/test_auto_Smooth.py +++ b/nipype/interfaces/spm/tests/test_auto_Smooth.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import Smooth diff --git a/nipype/interfaces/spm/tests/test_auto_Threshold.py b/nipype/interfaces/spm/tests/test_auto_Threshold.py index ab23139515..3f73cf91e0 100644 --- a/nipype/interfaces/spm/tests/test_auto_Threshold.py +++ b/nipype/interfaces/spm/tests/test_auto_Threshold.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import Threshold diff --git a/nipype/interfaces/spm/tests/test_auto_ThresholdStatistics.py b/nipype/interfaces/spm/tests/test_auto_ThresholdStatistics.py index c025f5f4d0..33c40f26ce 100644 --- a/nipype/interfaces/spm/tests/test_auto_ThresholdStatistics.py +++ b/nipype/interfaces/spm/tests/test_auto_ThresholdStatistics.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import ThresholdStatistics diff --git a/nipype/interfaces/spm/tests/test_auto_TwoSampleTTestDesign.py b/nipype/interfaces/spm/tests/test_auto_TwoSampleTTestDesign.py index faab30cd06..30b99be080 100644 --- a/nipype/interfaces/spm/tests/test_auto_TwoSampleTTestDesign.py +++ b/nipype/interfaces/spm/tests/test_auto_TwoSampleTTestDesign.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..model import TwoSampleTTestDesign diff --git a/nipype/interfaces/spm/tests/test_auto_VBMSegment.py b/nipype/interfaces/spm/tests/test_auto_VBMSegment.py index 561c0e6082..586b7b53e1 100644 --- a/nipype/interfaces/spm/tests/test_auto_VBMSegment.py +++ b/nipype/interfaces/spm/tests/test_auto_VBMSegment.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..preprocess import VBMSegment diff --git a/nipype/interfaces/spm/tests/test_base.py b/nipype/interfaces/spm/tests/test_base.py index a8a23e8def..c59cd6b234 100644 --- a/nipype/interfaces/spm/tests/test_base.py +++ b/nipype/interfaces/spm/tests/test_base.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 unicode_literals -from builtins import str, bytes - import os import numpy as np diff --git a/nipype/interfaces/spm/utils.py b/nipype/interfaces/spm/utils.py index 275f0781a9..919b5853ab 100644 --- a/nipype/interfaces/spm/utils.py +++ b/nipype/interfaces/spm/utils.py @@ -1,8 +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 import numpy as np diff --git a/nipype/interfaces/tests/test_auto_BIDSDataGrabber.py b/nipype/interfaces/tests/test_auto_BIDSDataGrabber.py index 24cbda657b..65cd8ea0c4 100644 --- a/nipype/interfaces/tests/test_auto_BIDSDataGrabber.py +++ b/nipype/interfaces/tests/test_auto_BIDSDataGrabber.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import BIDSDataGrabber diff --git a/nipype/interfaces/tests/test_auto_Bru2.py b/nipype/interfaces/tests/test_auto_Bru2.py index 07fda82064..ae9aa850a8 100644 --- a/nipype/interfaces/tests/test_auto_Bru2.py +++ b/nipype/interfaces/tests/test_auto_Bru2.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..bru2nii import Bru2 diff --git a/nipype/interfaces/tests/test_auto_C3d.py b/nipype/interfaces/tests/test_auto_C3d.py index 1e741f5a09..daf1077cf4 100644 --- a/nipype/interfaces/tests/test_auto_C3d.py +++ b/nipype/interfaces/tests/test_auto_C3d.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..c3 import C3d diff --git a/nipype/interfaces/tests/test_auto_C3dAffineTool.py b/nipype/interfaces/tests/test_auto_C3dAffineTool.py index 1326213e05..dd4884557a 100644 --- a/nipype/interfaces/tests/test_auto_C3dAffineTool.py +++ b/nipype/interfaces/tests/test_auto_C3dAffineTool.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..c3 import C3dAffineTool diff --git a/nipype/interfaces/tests/test_auto_CopyMeta.py b/nipype/interfaces/tests/test_auto_CopyMeta.py index afe30789d7..7f13dfc927 100644 --- a/nipype/interfaces/tests/test_auto_CopyMeta.py +++ b/nipype/interfaces/tests/test_auto_CopyMeta.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dcmstack import CopyMeta diff --git a/nipype/interfaces/tests/test_auto_DataFinder.py b/nipype/interfaces/tests/test_auto_DataFinder.py index 9a1b7418df..6ee0258218 100644 --- a/nipype/interfaces/tests/test_auto_DataFinder.py +++ b/nipype/interfaces/tests/test_auto_DataFinder.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import DataFinder diff --git a/nipype/interfaces/tests/test_auto_DataGrabber.py b/nipype/interfaces/tests/test_auto_DataGrabber.py index d39db0b527..c395eadd1a 100644 --- a/nipype/interfaces/tests/test_auto_DataGrabber.py +++ b/nipype/interfaces/tests/test_auto_DataGrabber.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import DataGrabber diff --git a/nipype/interfaces/tests/test_auto_DataSink.py b/nipype/interfaces/tests/test_auto_DataSink.py index da26854451..15af11755c 100644 --- a/nipype/interfaces/tests/test_auto_DataSink.py +++ b/nipype/interfaces/tests/test_auto_DataSink.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import DataSink diff --git a/nipype/interfaces/tests/test_auto_Dcm2nii.py b/nipype/interfaces/tests/test_auto_Dcm2nii.py index cff1205261..92ca835242 100644 --- a/nipype/interfaces/tests/test_auto_Dcm2nii.py +++ b/nipype/interfaces/tests/test_auto_Dcm2nii.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dcm2nii import Dcm2nii diff --git a/nipype/interfaces/tests/test_auto_Dcm2niix.py b/nipype/interfaces/tests/test_auto_Dcm2niix.py index 729b9aa6db..04ca6015ea 100644 --- a/nipype/interfaces/tests/test_auto_Dcm2niix.py +++ b/nipype/interfaces/tests/test_auto_Dcm2niix.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dcm2nii import Dcm2niix diff --git a/nipype/interfaces/tests/test_auto_DcmStack.py b/nipype/interfaces/tests/test_auto_DcmStack.py index e9a671b919..bffc1706ad 100644 --- a/nipype/interfaces/tests/test_auto_DcmStack.py +++ b/nipype/interfaces/tests/test_auto_DcmStack.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dcmstack import DcmStack diff --git a/nipype/interfaces/tests/test_auto_ExportFile.py b/nipype/interfaces/tests/test_auto_ExportFile.py index 335fe41372..d7aa25ddd9 100644 --- a/nipype/interfaces/tests/test_auto_ExportFile.py +++ b/nipype/interfaces/tests/test_auto_ExportFile.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import ExportFile diff --git a/nipype/interfaces/tests/test_auto_FreeSurferSource.py b/nipype/interfaces/tests/test_auto_FreeSurferSource.py index 8942b8d5e1..26511575ae 100644 --- a/nipype/interfaces/tests/test_auto_FreeSurferSource.py +++ b/nipype/interfaces/tests/test_auto_FreeSurferSource.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import FreeSurferSource diff --git a/nipype/interfaces/tests/test_auto_GroupAndStack.py b/nipype/interfaces/tests/test_auto_GroupAndStack.py index a8f30e32f9..a566467007 100644 --- a/nipype/interfaces/tests/test_auto_GroupAndStack.py +++ b/nipype/interfaces/tests/test_auto_GroupAndStack.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dcmstack import GroupAndStack diff --git a/nipype/interfaces/tests/test_auto_IOBase.py b/nipype/interfaces/tests/test_auto_IOBase.py index c2c2f96431..ddac7b4449 100644 --- a/nipype/interfaces/tests/test_auto_IOBase.py +++ b/nipype/interfaces/tests/test_auto_IOBase.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import IOBase diff --git a/nipype/interfaces/tests/test_auto_JSONFileGrabber.py b/nipype/interfaces/tests/test_auto_JSONFileGrabber.py index 7666a5c53f..61aea81044 100644 --- a/nipype/interfaces/tests/test_auto_JSONFileGrabber.py +++ b/nipype/interfaces/tests/test_auto_JSONFileGrabber.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import JSONFileGrabber diff --git a/nipype/interfaces/tests/test_auto_JSONFileSink.py b/nipype/interfaces/tests/test_auto_JSONFileSink.py index 4346a67252..d28df1cb66 100644 --- a/nipype/interfaces/tests/test_auto_JSONFileSink.py +++ b/nipype/interfaces/tests/test_auto_JSONFileSink.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import JSONFileSink diff --git a/nipype/interfaces/tests/test_auto_LookupMeta.py b/nipype/interfaces/tests/test_auto_LookupMeta.py index b63b96576a..8b5424ab6a 100644 --- a/nipype/interfaces/tests/test_auto_LookupMeta.py +++ b/nipype/interfaces/tests/test_auto_LookupMeta.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dcmstack import LookupMeta diff --git a/nipype/interfaces/tests/test_auto_MatlabCommand.py b/nipype/interfaces/tests/test_auto_MatlabCommand.py index 0ab56c426e..7e04090c78 100644 --- a/nipype/interfaces/tests/test_auto_MatlabCommand.py +++ b/nipype/interfaces/tests/test_auto_MatlabCommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..matlab import MatlabCommand diff --git a/nipype/interfaces/tests/test_auto_MergeNifti.py b/nipype/interfaces/tests/test_auto_MergeNifti.py index 9cfde35a9a..4898fc7fe7 100644 --- a/nipype/interfaces/tests/test_auto_MergeNifti.py +++ b/nipype/interfaces/tests/test_auto_MergeNifti.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dcmstack import MergeNifti diff --git a/nipype/interfaces/tests/test_auto_MeshFix.py b/nipype/interfaces/tests/test_auto_MeshFix.py index 39a8ff5ccf..557396f2fd 100644 --- a/nipype/interfaces/tests/test_auto_MeshFix.py +++ b/nipype/interfaces/tests/test_auto_MeshFix.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..meshfix import MeshFix diff --git a/nipype/interfaces/tests/test_auto_MySQLSink.py b/nipype/interfaces/tests/test_auto_MySQLSink.py index d534608fac..30899607a8 100644 --- a/nipype/interfaces/tests/test_auto_MySQLSink.py +++ b/nipype/interfaces/tests/test_auto_MySQLSink.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import MySQLSink diff --git a/nipype/interfaces/tests/test_auto_NiftiGeneratorBase.py b/nipype/interfaces/tests/test_auto_NiftiGeneratorBase.py index 88bc12dfa2..9bdd24ac4a 100644 --- a/nipype/interfaces/tests/test_auto_NiftiGeneratorBase.py +++ b/nipype/interfaces/tests/test_auto_NiftiGeneratorBase.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dcmstack import NiftiGeneratorBase diff --git a/nipype/interfaces/tests/test_auto_NilearnBaseInterface.py b/nipype/interfaces/tests/test_auto_NilearnBaseInterface.py index 38e4cfd698..0c9f8e2fc9 100644 --- a/nipype/interfaces/tests/test_auto_NilearnBaseInterface.py +++ b/nipype/interfaces/tests/test_auto_NilearnBaseInterface.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..nilearn import NilearnBaseInterface diff --git a/nipype/interfaces/tests/test_auto_PETPVC.py b/nipype/interfaces/tests/test_auto_PETPVC.py index de7c1fa272..e5b116d932 100644 --- a/nipype/interfaces/tests/test_auto_PETPVC.py +++ b/nipype/interfaces/tests/test_auto_PETPVC.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..petpvc import PETPVC diff --git a/nipype/interfaces/tests/test_auto_Quickshear.py b/nipype/interfaces/tests/test_auto_Quickshear.py index d08985a639..43ccd757c1 100644 --- a/nipype/interfaces/tests/test_auto_Quickshear.py +++ b/nipype/interfaces/tests/test_auto_Quickshear.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..quickshear import Quickshear diff --git a/nipype/interfaces/tests/test_auto_Reorient.py b/nipype/interfaces/tests/test_auto_Reorient.py index 76d393e0df..d6774a483c 100644 --- a/nipype/interfaces/tests/test_auto_Reorient.py +++ b/nipype/interfaces/tests/test_auto_Reorient.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..image import Reorient diff --git a/nipype/interfaces/tests/test_auto_Rescale.py b/nipype/interfaces/tests/test_auto_Rescale.py index 2bdc274d81..e3e2bf151b 100644 --- a/nipype/interfaces/tests/test_auto_Rescale.py +++ b/nipype/interfaces/tests/test_auto_Rescale.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..image import Rescale diff --git a/nipype/interfaces/tests/test_auto_S3DataGrabber.py b/nipype/interfaces/tests/test_auto_S3DataGrabber.py index 7c69413eb0..ff13619248 100644 --- a/nipype/interfaces/tests/test_auto_S3DataGrabber.py +++ b/nipype/interfaces/tests/test_auto_S3DataGrabber.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import S3DataGrabber diff --git a/nipype/interfaces/tests/test_auto_SEMLikeCommandLine.py b/nipype/interfaces/tests/test_auto_SEMLikeCommandLine.py deleted file mode 100644 index 7777a8443e..0000000000 --- a/nipype/interfaces/tests/test_auto_SEMLikeCommandLine.py +++ /dev/null @@ -1,18 +0,0 @@ -# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals -from ..base import SEMLikeCommandLine - - -def test_SEMLikeCommandLine_inputs(): - input_map = dict(args=dict(argstr='%s', - ), - environ=dict(nohash=True, - usedefault=True, - ), - ) - inputs = SEMLikeCommandLine.input_spec() - - for key, metadata in list(input_map.items()): - for metakey, value in list(metadata.items()): - assert getattr(inputs.traits()[key], metakey) == value - diff --git a/nipype/interfaces/tests/test_auto_SQLiteSink.py b/nipype/interfaces/tests/test_auto_SQLiteSink.py index 190e8aeee4..353e01e985 100644 --- a/nipype/interfaces/tests/test_auto_SQLiteSink.py +++ b/nipype/interfaces/tests/test_auto_SQLiteSink.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import SQLiteSink diff --git a/nipype/interfaces/tests/test_auto_SSHDataGrabber.py b/nipype/interfaces/tests/test_auto_SSHDataGrabber.py index cc7aa22e38..e3755c8a75 100644 --- a/nipype/interfaces/tests/test_auto_SSHDataGrabber.py +++ b/nipype/interfaces/tests/test_auto_SSHDataGrabber.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import SSHDataGrabber diff --git a/nipype/interfaces/tests/test_auto_SelectFiles.py b/nipype/interfaces/tests/test_auto_SelectFiles.py index bf438fb826..ed6c276ddf 100644 --- a/nipype/interfaces/tests/test_auto_SelectFiles.py +++ b/nipype/interfaces/tests/test_auto_SelectFiles.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import SelectFiles diff --git a/nipype/interfaces/tests/test_auto_SignalExtraction.py b/nipype/interfaces/tests/test_auto_SignalExtraction.py index b102048118..3ca02656b1 100644 --- a/nipype/interfaces/tests/test_auto_SignalExtraction.py +++ b/nipype/interfaces/tests/test_auto_SignalExtraction.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..nilearn import SignalExtraction diff --git a/nipype/interfaces/tests/test_auto_SlicerCommandLine.py b/nipype/interfaces/tests/test_auto_SlicerCommandLine.py index 057628e879..43ae697eec 100644 --- a/nipype/interfaces/tests/test_auto_SlicerCommandLine.py +++ b/nipype/interfaces/tests/test_auto_SlicerCommandLine.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dynamic_slicer import SlicerCommandLine diff --git a/nipype/interfaces/tests/test_auto_SplitNifti.py b/nipype/interfaces/tests/test_auto_SplitNifti.py index 18e8ee9798..06dd71feba 100644 --- a/nipype/interfaces/tests/test_auto_SplitNifti.py +++ b/nipype/interfaces/tests/test_auto_SplitNifti.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..dcmstack import SplitNifti diff --git a/nipype/interfaces/tests/test_auto_XNATSink.py b/nipype/interfaces/tests/test_auto_XNATSink.py index b3e800e4e4..0206281382 100644 --- a/nipype/interfaces/tests/test_auto_XNATSink.py +++ b/nipype/interfaces/tests/test_auto_XNATSink.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import XNATSink diff --git a/nipype/interfaces/tests/test_auto_XNATSource.py b/nipype/interfaces/tests/test_auto_XNATSource.py index adb5d8657a..c26553e390 100644 --- a/nipype/interfaces/tests/test_auto_XNATSource.py +++ b/nipype/interfaces/tests/test_auto_XNATSource.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..io import XNATSource diff --git a/nipype/interfaces/tests/test_io.py b/nipype/interfaces/tests/test_io.py index 9cb7e05075..1b718f0533 100644 --- a/nipype/interfaces/tests/test_io.py +++ b/nipype/interfaces/tests/test_io.py @@ -1,16 +1,11 @@ # -*- 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, unicode_literals -from builtins import str, zip, range, open -from future import standard_library import os import copy import simplejson import glob -import shutil import os.path as op -import sys from subprocess import Popen import hashlib from collections import namedtuple @@ -20,7 +15,7 @@ import nipype.interfaces.io as nio from nipype.interfaces.base.traits_extension import isdefined from nipype.interfaces.base import Undefined, TraitError -from nipype.utils.filemanip import dist_is_editable, FileExistsError +from nipype.utils.filemanip import dist_is_editable # Check for boto noboto = False @@ -65,7 +60,6 @@ no_local_ssh = True # Check for fakes3 -standard_library.install_aliases() from subprocess import check_call, CalledProcessError try: ret_code = check_call(['which', 'fakes3'], stdout=open(os.devnull, 'wb')) diff --git a/nipype/interfaces/utility/base.py b/nipype/interfaces/utility/base.py index 8ae05ad66b..3261be0c53 100644 --- a/nipype/interfaces/utility/base.py +++ b/nipype/interfaces/utility/base.py @@ -6,13 +6,6 @@ >>> tmp = getfixture('tmpdir') >>> old = tmp.chdir() """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range - -from future import standard_library -standard_library.install_aliases() - import os import re import numpy as np diff --git a/nipype/interfaces/utility/csv.py b/nipype/interfaces/utility/csv.py index 16c377e3b5..d22b146d74 100644 --- a/nipype/interfaces/utility/csv.py +++ b/nipype/interfaces/utility/csv.py @@ -3,13 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """CSV Handling utilities """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import zip, range, str, open - -from future import standard_library -standard_library.install_aliases() - from ..base import (traits, TraitedSpec, DynamicTraitedSpec, File, BaseInterface) from ..io import add_traits diff --git a/nipype/interfaces/utility/tests/test_auto_AssertEqual.py b/nipype/interfaces/utility/tests/test_auto_AssertEqual.py index d0af3a5ed9..c550a5efba 100644 --- a/nipype/interfaces/utility/tests/test_auto_AssertEqual.py +++ b/nipype/interfaces/utility/tests/test_auto_AssertEqual.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import AssertEqual diff --git a/nipype/interfaces/utility/tests/test_auto_CSVReader.py b/nipype/interfaces/utility/tests/test_auto_CSVReader.py index b0ce577808..8bd60f55ad 100644 --- a/nipype/interfaces/utility/tests/test_auto_CSVReader.py +++ b/nipype/interfaces/utility/tests/test_auto_CSVReader.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..csv import CSVReader diff --git a/nipype/interfaces/utility/tests/test_auto_Function.py b/nipype/interfaces/utility/tests/test_auto_Function.py index 5c2505fe16..f4e353bb27 100644 --- a/nipype/interfaces/utility/tests/test_auto_Function.py +++ b/nipype/interfaces/utility/tests/test_auto_Function.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..wrappers import Function diff --git a/nipype/interfaces/utility/tests/test_auto_IdentityInterface.py b/nipype/interfaces/utility/tests/test_auto_IdentityInterface.py index 97523d0b86..be12e0bad7 100644 --- a/nipype/interfaces/utility/tests/test_auto_IdentityInterface.py +++ b/nipype/interfaces/utility/tests/test_auto_IdentityInterface.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import IdentityInterface diff --git a/nipype/interfaces/utility/tests/test_auto_Merge.py b/nipype/interfaces/utility/tests/test_auto_Merge.py index 71e7d2db0a..a7ed5c3a31 100644 --- a/nipype/interfaces/utility/tests/test_auto_Merge.py +++ b/nipype/interfaces/utility/tests/test_auto_Merge.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import Merge diff --git a/nipype/interfaces/utility/tests/test_auto_Rename.py b/nipype/interfaces/utility/tests/test_auto_Rename.py index 70ced0ecdd..177f205ef0 100644 --- a/nipype/interfaces/utility/tests/test_auto_Rename.py +++ b/nipype/interfaces/utility/tests/test_auto_Rename.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import Rename diff --git a/nipype/interfaces/utility/tests/test_auto_Select.py b/nipype/interfaces/utility/tests/test_auto_Select.py index e241f7ed76..abc81b45da 100644 --- a/nipype/interfaces/utility/tests/test_auto_Select.py +++ b/nipype/interfaces/utility/tests/test_auto_Select.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import Select diff --git a/nipype/interfaces/utility/tests/test_auto_Split.py b/nipype/interfaces/utility/tests/test_auto_Split.py index 8acbceef99..20dbd948dc 100644 --- a/nipype/interfaces/utility/tests/test_auto_Split.py +++ b/nipype/interfaces/utility/tests/test_auto_Split.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import Split diff --git a/nipype/interfaces/utility/tests/test_base.py b/nipype/interfaces/utility/tests/test_base.py index 159454a7fc..0356452638 100644 --- a/nipype/interfaces/utility/tests/test_base.py +++ b/nipype/interfaces/utility/tests/test_base.py @@ -1,7 +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, unicode_literals import os import pytest diff --git a/nipype/interfaces/utility/tests/test_csv.py b/nipype/interfaces/utility/tests/test_csv.py index a5c678153e..3c15c81239 100644 --- a/nipype/interfaces/utility/tests/test_csv.py +++ b/nipype/interfaces/utility/tests/test_csv.py @@ -1,7 +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, unicode_literals from nipype.interfaces import utility diff --git a/nipype/interfaces/utility/tests/test_wrappers.py b/nipype/interfaces/utility/tests/test_wrappers.py index 380d840cee..eb145f51ef 100644 --- a/nipype/interfaces/utility/tests/test_wrappers.py +++ b/nipype/interfaces/utility/tests/test_wrappers.py @@ -1,7 +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, unicode_literals import os import pytest diff --git a/nipype/interfaces/utility/wrappers.py b/nipype/interfaces/utility/wrappers.py index 80a6f89738..e775c9a540 100644 --- a/nipype/interfaces/utility/wrappers.py +++ b/nipype/interfaces/utility/wrappers.py @@ -6,15 +6,6 @@ >>> tmp = getfixture('tmpdir') >>> old = tmp.chdir() """ - -from __future__ import (print_function, division, unicode_literals, - absolute_import) - -from future import standard_library -standard_library.install_aliases() - -from builtins import str, bytes - from ... import logging from ..base import (traits, DynamicTraitedSpec, Undefined, isdefined, BaseInterfaceInputSpec) diff --git a/nipype/interfaces/vista/tests/test_auto_Vnifti2Image.py b/nipype/interfaces/vista/tests/test_auto_Vnifti2Image.py index d5e5958ef4..5168f61ea7 100644 --- a/nipype/interfaces/vista/tests/test_auto_Vnifti2Image.py +++ b/nipype/interfaces/vista/tests/test_auto_Vnifti2Image.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..vista import Vnifti2Image diff --git a/nipype/interfaces/vista/tests/test_auto_VtoMat.py b/nipype/interfaces/vista/tests/test_auto_VtoMat.py index c789175132..788f1e5d9e 100644 --- a/nipype/interfaces/vista/tests/test_auto_VtoMat.py +++ b/nipype/interfaces/vista/tests/test_auto_VtoMat.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..vista import VtoMat diff --git a/nipype/interfaces/vista/vista.py b/nipype/interfaces/vista/vista.py index 5000036d02..ada6f430f1 100644 --- a/nipype/interfaces/vista/vista.py +++ b/nipype/interfaces/vista/vista.py @@ -1,8 +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) from ..base import CommandLineInputSpec, CommandLine, TraitedSpec, File diff --git a/nipype/interfaces/vtkbase.py b/nipype/interfaces/vtkbase.py index 1ec66ea614..67edef41c3 100644 --- a/nipype/interfaces/vtkbase.py +++ b/nipype/interfaces/vtkbase.py @@ -6,8 +6,6 @@ Code using tvtk should import it through this module """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os from .. import logging diff --git a/nipype/interfaces/workbench/base.py b/nipype/interfaces/workbench/base.py index 4adc9dc69b..2c2620dbb6 100644 --- a/nipype/interfaces/workbench/base.py +++ b/nipype/interfaces/workbench/base.py @@ -10,8 +10,6 @@ Human Connectome Project. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os import re diff --git a/nipype/interfaces/workbench/cifti.py b/nipype/interfaces/workbench/cifti.py index be4051e5b4..fa288aeead 100644 --- a/nipype/interfaces/workbench/cifti.py +++ b/nipype/interfaces/workbench/cifti.py @@ -2,9 +2,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: """This module provides interfaces for workbench CIFTI commands""" -from __future__ import (print_function, division, unicode_literals, - absolute_import) - from ..base import (TraitedSpec, File, traits, CommandLineInputSpec) from .base import WBCommand from ... import logging diff --git a/nipype/interfaces/workbench/metric.py b/nipype/interfaces/workbench/metric.py index e5bbb60739..b3653576a4 100644 --- a/nipype/interfaces/workbench/metric.py +++ b/nipype/interfaces/workbench/metric.py @@ -2,8 +2,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: """This module provides interfaces for workbench surface commands""" -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os from ..base import (TraitedSpec, File, traits, CommandLineInputSpec) diff --git a/nipype/interfaces/workbench/tests/test_auto_CiftiSmooth.py b/nipype/interfaces/workbench/tests/test_auto_CiftiSmooth.py index b77a318deb..a045eb29f5 100644 --- a/nipype/interfaces/workbench/tests/test_auto_CiftiSmooth.py +++ b/nipype/interfaces/workbench/tests/test_auto_CiftiSmooth.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..cifti import CiftiSmooth diff --git a/nipype/interfaces/workbench/tests/test_auto_MetricResample.py b/nipype/interfaces/workbench/tests/test_auto_MetricResample.py index ad6494bc09..f5ed55874b 100644 --- a/nipype/interfaces/workbench/tests/test_auto_MetricResample.py +++ b/nipype/interfaces/workbench/tests/test_auto_MetricResample.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..metric import MetricResample diff --git a/nipype/interfaces/workbench/tests/test_auto_WBCommand.py b/nipype/interfaces/workbench/tests/test_auto_WBCommand.py index b496a270dd..cccba55c95 100644 --- a/nipype/interfaces/workbench/tests/test_auto_WBCommand.py +++ b/nipype/interfaces/workbench/tests/test_auto_WBCommand.py @@ -1,5 +1,4 @@ # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT -from __future__ import unicode_literals from ..base import WBCommand diff --git a/nipype/pipeline/__init__.py b/nipype/pipeline/__init__.py index badfda5ba0..b410fc8ea0 100644 --- a/nipype/pipeline/__init__.py +++ b/nipype/pipeline/__init__.py @@ -5,7 +5,5 @@ Package contains modules for generating pipelines using interfaces """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) __docformat__ = 'restructuredtext' from .engine import Node, MapNode, JoinNode, Workflow diff --git a/nipype/pipeline/engine/__init__.py b/nipype/pipeline/engine/__init__.py index e950086307..4dc6784276 100644 --- a/nipype/pipeline/engine/__init__.py +++ b/nipype/pipeline/engine/__init__.py @@ -7,7 +7,6 @@ """ -from __future__ import absolute_import __docformat__ = 'restructuredtext' from .workflows import Workflow from .nodes import Node, MapNode, JoinNode diff --git a/nipype/pipeline/engine/base.py b/nipype/pipeline/engine/base.py index 7f7afd3928..fef31d00b9 100644 --- a/nipype/pipeline/engine/base.py +++ b/nipype/pipeline/engine/base.py @@ -6,10 +6,6 @@ The `EngineBase` class implements the more general view of a task. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import object - from copy import deepcopy import re import numpy as np diff --git a/nipype/pipeline/engine/nodes.py b/nipype/pipeline/engine/nodes.py index eeb47f6d7a..23ec799244 100644 --- a/nipype/pipeline/engine/nodes.py +++ b/nipype/pipeline/engine/nodes.py @@ -5,10 +5,6 @@ The `Node` class provides core functionality for batch processing. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range, str, bytes, open - from collections import OrderedDict, defaultdict import os @@ -20,14 +16,12 @@ from logging import INFO from tempfile import mkdtemp -from future import standard_library from ... import config, logging from ...utils.misc import flatten, unflatten, str2bool, dict_diff -from ...utils.filemanip import (md5, FileNotFoundError, ensure_list, - simplify_list, copyfiles, fnames_presuffix, - loadpkl, split_filename, load_json, makedirs, - emptydirs, savepkl, to_str, indirectory, silentrm) +from ...utils.filemanip import (md5, ensure_list, simplify_list, copyfiles, fnames_presuffix, + loadpkl, split_filename, load_json, + emptydirs, savepkl, indirectory, silentrm) from ...interfaces.base import (traits, InputMultiPath, CommandLine, Undefined, DynamicTraitedSpec, Bunch, InterfaceResult, @@ -41,8 +35,6 @@ clean_working_directory, merge_dict, evaluate_connect_function) from .base import EngineBase -standard_library.install_aliases() - logger = logging.getLogger('nipype.workflow') @@ -275,7 +267,7 @@ def output_dir(self): def set_input(self, parameter, val): """Set interface input value""" logger.debug('[Node] %s - setting input %s = %s', self.name, parameter, - to_str(val)) + str(val)) setattr(self.inputs, parameter, deepcopy(val)) def get_output(self, parameter): @@ -467,7 +459,7 @@ def run(self, updatehash=False): os.remove(filename) # Make sure outdir is created - makedirs(outdir, exist_ok=True) + os.makedirs(outdir, exist_ok=True) # Store runtime-hashfile, pre-execution report, the node and the inputs set. _save_hashfile(hashfile_unfinished, self._hashed_inputs) @@ -710,7 +702,7 @@ def _copyfiles_to_wd(self, execute=True, linksonly=False): if execute and linksonly: olddir = outdir outdir = op.join(outdir, '_tempinput') - makedirs(outdir, exist_ok=True) + os.makedirs(outdir, exist_ok=True) for info in filecopy_info: files = self.inputs.trait_get().get(info['key']) @@ -1066,13 +1058,13 @@ def set_input(self, parameter, val): Set interface input value or nodewrapper attribute Priority goes to interface. """ - logger.debug('setting nodelevel(%s) input %s = %s', to_str(self), - parameter, to_str(val)) + logger.debug('setting nodelevel(%s) input %s = %s', str(self), + parameter, str(val)) self._set_mapnode_input(parameter, deepcopy(val)) def _set_mapnode_input(self, name, newvalue): - logger.debug('setting mapnode(%s) input: %s -> %s', to_str(self), name, - to_str(newvalue)) + logger.debug('setting mapnode(%s) input: %s -> %s', str(self), name, + str(newvalue)) if name in self.iterfield: setattr(self._inputs, name, newvalue) else: diff --git a/nipype/pipeline/engine/tests/test_base.py b/nipype/pipeline/engine/tests/test_base.py index 5b072e9ee6..c6b9135f54 100644 --- a/nipype/pipeline/engine/tests/test_base.py +++ b/nipype/pipeline/engine/tests/test_base.py @@ -1,7 +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, unicode_literals import pytest from ..base import EngineBase diff --git a/nipype/pipeline/engine/tests/test_engine.py b/nipype/pipeline/engine/tests/test_engine.py index 189a918833..083aa8b691 100644 --- a/nipype/pipeline/engine/tests/test_engine.py +++ b/nipype/pipeline/engine/tests/test_engine.py @@ -3,15 +3,10 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Tests for the engine module """ - -from __future__ import print_function -from __future__ import unicode_literals -from builtins import open from copy import deepcopy from glob import glob import os - import pytest from ... import engine as pe from .test_base import EngineTestInterface diff --git a/nipype/pipeline/engine/tests/test_join.py b/nipype/pipeline/engine/tests/test_join.py index 8553b79dc9..f59d9d4bc1 100644 --- a/nipype/pipeline/engine/tests/test_join.py +++ b/nipype/pipeline/engine/tests/test_join.py @@ -3,9 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Tests for join expansion """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open import pytest from .... import config diff --git a/nipype/pipeline/engine/tests/test_nodes.py b/nipype/pipeline/engine/tests/test_nodes.py index ea03fe69ae..395ede54bb 100644 --- a/nipype/pipeline/engine/tests/test_nodes.py +++ b/nipype/pipeline/engine/tests/test_nodes.py @@ -1,8 +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, unicode_literals -from builtins import str import os from copy import deepcopy import pytest diff --git a/nipype/pipeline/engine/tests/test_utils.py b/nipype/pipeline/engine/tests/test_utils.py index dd44f430e1..83f5aef282 100644 --- a/nipype/pipeline/engine/tests/test_utils.py +++ b/nipype/pipeline/engine/tests/test_utils.py @@ -3,12 +3,7 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Tests for the engine utils module """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range, open - import os -import sys from copy import deepcopy import pytest @@ -164,8 +159,6 @@ def dummy_func(value): return value + 1 -@pytest.mark.skipif( - sys.version_info < (3, 0), reason="the famous segfault #1788") def test_mapnode_crash(tmpdir): """Test mapnode crash when stop_on_first_crash is True""" cwd = os.getcwd() @@ -185,8 +178,6 @@ def test_mapnode_crash(tmpdir): os.chdir(cwd) -@pytest.mark.skipif( - sys.version_info < (3, 0), reason="the famous segfault #1788") def test_mapnode_crash2(tmpdir): """Test mapnode crash when stop_on_first_crash is False""" cwd = os.getcwd() @@ -205,8 +196,6 @@ def test_mapnode_crash2(tmpdir): os.chdir(cwd) -@pytest.mark.skipif( - sys.version_info < (3, 0), reason="the famous segfault #1788") def test_mapnode_crash3(tmpdir): """Test mapnode crash when mapnode is embedded in a workflow""" tmpdir.chdir() @@ -286,8 +275,6 @@ def test_modify_paths_bug(tmpdir): assert outputs.out_list == [out_str] * 2 -@pytest.mark.xfail(sys.version_info < (3, 4), - reason="rebase does not fully work with Python 2.7") @pytest.mark.parametrize("use_relative", [True, False]) def test_save_load_resultfile(tmpdir, use_relative): """Test minimally the save/load functions for result files.""" diff --git a/nipype/pipeline/engine/utils.py b/nipype/pipeline/engine/utils.py index 5005eaa332..78d9417f9f 100644 --- a/nipype/pipeline/engine/utils.py +++ b/nipype/pipeline/engine/utils.py @@ -2,9 +2,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: """Utility routines for workflow graphs""" -from __future__ import print_function, division, unicode_literals, absolute_import -from builtins import str, open, next, zip, range - import os import sys import pickle @@ -12,6 +9,7 @@ import re from copy import deepcopy from glob import glob +from pathlib import Path from traceback import format_exception from hashlib import sha1 @@ -19,17 +17,12 @@ from functools import reduce import numpy as np -from future import standard_library from ... import logging, config, LooseVersion from ...utils.filemanip import ( - Path, - path_mkdir, indirectory, relpath, - makedirs, fname_presuffix, - to_str, ensure_list, get_related_files, save_json, @@ -38,7 +31,6 @@ write_rst_header, write_rst_dict, write_rst_list, - FileNotFoundError, ) from ...utils.misc import str2bool from ...utils.functions import create_function_from_source @@ -54,14 +46,9 @@ from ...interfaces.utility import IdentityInterface from ...utils.provenance import ProvStore, pm, nipype_ns, get_id -try: - from inspect import signature -except ImportError: - from funcsigs import signature +from inspect import signature -standard_library.install_aliases() logger = logging.getLogger("nipype.workflow") -PY3 = sys.version_info[0] > 2 def _parameterization_dir(param): @@ -127,7 +114,7 @@ def write_node_report(node, result=None, is_mapnode=False): cwd = node.output_dir() report_file = Path(cwd) / "_report" / "report.rst" - path_mkdir(report_file.parent, exist_ok=True, parents=True) + report_file.parent.mkdir(exist_ok=True, parents=True) lines = [ write_rst_header("Node: %s" % get_print_name(node), level=0), @@ -405,8 +392,6 @@ def format_node(node, format="python", include_config=False): if include_config: lines = [ importline, - "from future import standard_library", - "standard_library.install_aliases()", "from collections import OrderedDict", comment, nodedef, @@ -618,7 +603,7 @@ def _get_valid_pathstr(pathstr): Replaces: ',' -> '.' """ if not isinstance(pathstr, (str, bytes)): - pathstr = to_str(pathstr) + pathstr = str(pathstr) pathstr = pathstr.replace(os.sep, "..") pathstr = re.sub(r"""[][ (){}?:<>#!|"';]""", "", pathstr) pathstr = pathstr.replace(",", ".") @@ -1389,7 +1374,7 @@ def export_graph( if base_dir is None: base_dir = os.getcwd() - makedirs(base_dir, exist_ok=True) + os.makedirs(base_dir, exist_ok=True) out_dot = fname_presuffix( dotfilename, suffix="_detailed.dot", use_ext=False, newpath=base_dir ) @@ -1697,7 +1682,7 @@ def write_workflow_resources(graph, filename=None, append=None): # If we append different runs, then we will see different # "bursts" of timestamps corresponding to those executions. if append and os.path.isfile(filename): - with open(filename, "r" if PY3 else "rb") as rsf: + with open(filename, "r") as rsf: big_dict = json.load(rsf) for _, node in enumerate(graph.nodes()): @@ -1742,7 +1727,7 @@ def write_workflow_resources(graph, filename=None, append=None): big_dict["mapnode"] += [subidx] * nsamples big_dict["params"] += [params] * nsamples - with open(filename, "w" if PY3 else "wb") as rsf: + with open(filename, "w") as rsf: json.dump(big_dict, rsf, ensure_ascii=False) return filename diff --git a/nipype/pipeline/engine/workflows.py b/nipype/pipeline/engine/workflows.py index 6c0757bead..195ebc6f69 100644 --- a/nipype/pipeline/engine/workflows.py +++ b/nipype/pipeline/engine/workflows.py @@ -6,10 +6,6 @@ The `Workflow` class provides core functionality for batch processing. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import str, bytes, open - import os import os.path as op import sys @@ -26,7 +22,7 @@ from ...interfaces.base import (traits, TraitedSpec, TraitDictObject, TraitListObject) -from ...utils.filemanip import save_json, makedirs, to_str +from ...utils.filemanip import save_json from .utils import (generate_expanded_graph, export_graph, write_workflow_prov, write_workflow_resources, format_dot, topological_sort, get_print_name, merge_dict, format_node) @@ -34,10 +30,6 @@ from .base import EngineBase from .nodes import MapNode -# Py2 compat: http://python-future.org/compatible_idioms.html#collections-counter-and-ordereddict -from future import standard_library -standard_library.install_aliases() - logger = logging.getLogger('nipype.workflow') @@ -226,12 +218,12 @@ def connect(self, *args, **kwargs): edge_data = self._graph.get_edge_data(srcnode, destnode, None) if edge_data: logger.debug('(%s, %s): Edge data exists: %s', srcnode, - destnode, to_str(edge_data)) + destnode, str(edge_data)) for data in connects: if data not in edge_data['connect']: edge_data['connect'].append(data) if disconnect: - logger.debug('Removing connection: %s', to_str(data)) + logger.debug('Removing connection: %s', str(data)) edge_data['connect'].remove(data) if edge_data['connect']: self._graph.add_edges_from([(srcnode, destnode, @@ -248,7 +240,7 @@ def connect(self, *args, **kwargs): })]) edge_data = self._graph.get_edge_data(srcnode, destnode) logger.debug('(%s, %s): new edge data: %s', srcnode, destnode, - to_str(edge_data)) + str(edge_data)) def disconnect(self, *args): """Disconnect nodes @@ -264,7 +256,7 @@ def disconnect(self, *args): for srcnode, dstnode, conn in connection_list: logger.debug('disconnect(): %s->%s %s', srcnode, dstnode, - to_str(conn)) + str(conn)) if self in [srcnode, dstnode]: raise IOError( 'Workflow connect cannot contain itself as node: src[%s] ' @@ -285,10 +277,10 @@ def disconnect(self, *args): # idx = ed_conns.index(edge) remove.append((edge[0], edge[1])) - logger.debug('disconnect(): remove list %s', to_str(remove)) + logger.debug('disconnect(): remove list %s', str(remove)) for el in remove: edge_data['connect'].remove(el) - logger.debug('disconnect(): removed connection %s', to_str(el)) + logger.debug('disconnect(): removed connection %s', str(el)) if not edge_data['connect']: self._graph.remove_edge(srcnode, dstnode) @@ -418,7 +410,7 @@ def write_graph(self, base_dir = op.join(base_dir, self.name) else: base_dir = os.getcwd() - base_dir = makedirs(base_dir, exist_ok=True) + os.makedirs(base_dir, exist_ok=True) if graph2use in ['hierarchical', 'colored']: if self.name[:1].isdigit(): # these graphs break if int raise ValueError('{} graph failed, workflow name cannot begin ' @@ -584,7 +576,7 @@ def run(self, plugin=None, plugin_args=None, updatehash=False): flatgraph = self._create_flat_graph() self.config = merge_dict(deepcopy(config._sections), self.config) logger.info('Workflow %s settings: %s', self.name, - to_str(sorted(self.config))) + str(sorted(self.config))) self._set_needed_outputs(flatgraph) execgraph = generate_expanded_graph(deepcopy(flatgraph)) for index, node in enumerate(execgraph.nodes()): @@ -617,7 +609,7 @@ def _write_report_info(self, workingdir, name, graph): if workingdir is None: workingdir = os.getcwd() report_dir = op.join(workingdir, name) - makedirs(report_dir, exist_ok=True) + os.makedirs(report_dir, exist_ok=True) shutil.copyfile( op.join(op.dirname(__file__), 'report_template.html'), op.join(report_dir, 'index.html')) @@ -829,7 +821,7 @@ def _set_node_input(self, node, param, source, sourceinfo): newval = dict(val) if isinstance(val, TraitListObject): newval = val[:] - logger.debug('setting node input: %s->%s', param, to_str(newval)) + logger.debug('setting node input: %s->%s', param, str(newval)) node.set_input(param, deepcopy(newval)) def _get_all_nodes(self): @@ -889,9 +881,9 @@ def _generate_flatgraph(self): # dj: added list() for networkx ver.2 for u, _, d in list( self._graph.in_edges(nbunch=node, data=True)): - logger.debug('in: connections-> %s', to_str(d['connect'])) + logger.debug('in: connections-> %s', str(d['connect'])) for cd in deepcopy(d['connect']): - logger.debug("in: %s", to_str(cd)) + logger.debug("in: %s", str(cd)) dstnode = node._get_parameter_node(cd[1], subtype='in') srcnode = u srcout = cd[0] @@ -904,9 +896,9 @@ def _generate_flatgraph(self): # dj: for ver 2 use list(out_edges) for _, v, d in list( self._graph.out_edges(nbunch=node, data=True)): - logger.debug('out: connections-> %s', to_str(d['connect'])) + logger.debug('out: connections-> %s', str(d['connect'])) for cd in deepcopy(d['connect']): - logger.debug("out: %s", to_str(cd)) + logger.debug("out: %s", str(cd)) dstnode = v if isinstance(cd[0], tuple): parameter = cd[0][0] diff --git a/nipype/pipeline/plugins/__init__.py b/nipype/pipeline/plugins/__init__.py index e3c797a10a..83f4869a41 100644 --- a/nipype/pipeline/plugins/__init__.py +++ b/nipype/pipeline/plugins/__init__.py @@ -1,8 +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) from .debug import DebugPlugin from .linear import LinearPlugin diff --git a/nipype/pipeline/plugins/base.py b/nipype/pipeline/plugins/base.py index eee9a36657..23c8faa5b9 100644 --- a/nipype/pipeline/plugins/base.py +++ b/nipype/pipeline/plugins/base.py @@ -3,10 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Common graph operations for execution """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range, object, open - import sys from copy import deepcopy from glob import glob diff --git a/nipype/pipeline/plugins/condor.py b/nipype/pipeline/plugins/condor.py index 9f5ca632e5..bdf598c5f6 100644 --- a/nipype/pipeline/plugins/condor.py +++ b/nipype/pipeline/plugins/condor.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- """Parallel workflow execution via Condor """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os from time import sleep diff --git a/nipype/pipeline/plugins/dagman.py b/nipype/pipeline/plugins/dagman.py index 28b766f2ea..9db1f70fe5 100644 --- a/nipype/pipeline/plugins/dagman.py +++ b/nipype/pipeline/plugins/dagman.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- """Parallel workflow execution via Condor DAGMan """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open - import os import sys import uuid diff --git a/nipype/pipeline/plugins/debug.py b/nipype/pipeline/plugins/debug.py index 9921bb9cf4..0b9b009c2f 100644 --- a/nipype/pipeline/plugins/debug.py +++ b/nipype/pipeline/plugins/debug.py @@ -3,8 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Debug plugin """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import networkx as nx from .base import PluginBase, logger diff --git a/nipype/pipeline/plugins/ipython.py b/nipype/pipeline/plugins/ipython.py index aa20f935c1..eafeb904e3 100644 --- a/nipype/pipeline/plugins/ipython.py +++ b/nipype/pipeline/plugins/ipython.py @@ -3,13 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Parallel workflow execution via IPython controller """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) - -from future import standard_library -standard_library.install_aliases() -from future.utils import raise_from - from pickle import dumps import sys @@ -76,20 +69,18 @@ def run(self, graph, config, updatehash=False): __import__(name) self.iparallel = sys.modules[name] except ImportError as e: - raise_from( - ImportError("ipyparallel not found. Parallel execution " - "will be unavailable"), e) + raise ImportError("ipyparallel not found. Parallel execution " + "will be unavailable") from e try: self.taskclient = self.iparallel.Client(**self.client_args) except Exception as e: if isinstance(e, TimeoutError): - raise_from(Exception("No IPython clients found."), e) + raise Exception("No IPython clients found.") from e if isinstance(e, IOError): - raise_from( - Exception("ipcluster/ipcontroller has not been started"), - e) + raise Exception("ipcluster/ipcontroller has not been started") \ + from e if isinstance(e, ValueError): - raise_from(Exception("Ipython kernel not installed"), e) + raise Exception("Ipython kernel not installed") from e else: raise e return super(IPythonPlugin, self).run( diff --git a/nipype/pipeline/plugins/legacymultiproc.py b/nipype/pipeline/plugins/legacymultiproc.py index 9e96144a4a..451770e2bd 100644 --- a/nipype/pipeline/plugins/legacymultiproc.py +++ b/nipype/pipeline/plugins/legacymultiproc.py @@ -6,8 +6,6 @@ Support for child processes running as non-daemons based on http://stackoverflow.com/a/8963618/1183453 """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) # Import packages import os diff --git a/nipype/pipeline/plugins/linear.py b/nipype/pipeline/plugins/linear.py index 3f8ec51463..732636ca12 100644 --- a/nipype/pipeline/plugins/linear.py +++ b/nipype/pipeline/plugins/linear.py @@ -3,8 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Local serial workflow execution """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os from .base import (PluginBase, logger, report_crash, report_nodes_not_run, diff --git a/nipype/pipeline/plugins/lsf.py b/nipype/pipeline/plugins/lsf.py index 7f687a69ec..866529d8bb 100644 --- a/nipype/pipeline/plugins/lsf.py +++ b/nipype/pipeline/plugins/lsf.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- """Parallel workflow execution via LSF """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os import re diff --git a/nipype/pipeline/plugins/multiproc.py b/nipype/pipeline/plugins/multiproc.py index eea567ff78..f310d97912 100644 --- a/nipype/pipeline/plugins/multiproc.py +++ b/nipype/pipeline/plugins/multiproc.py @@ -6,8 +6,6 @@ Support for child processes running as non-daemons based on http://stackoverflow.com/a/8963618/1183453 """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) # Import packages import os diff --git a/nipype/pipeline/plugins/oar.py b/nipype/pipeline/plugins/oar.py index c68b42379f..5ce718c250 100644 --- a/nipype/pipeline/plugins/oar.py +++ b/nipype/pipeline/plugins/oar.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- """Parallel workflow execution via OAR http://oar.imag.fr """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) - -from builtins import str, open import os import stat from time import sleep diff --git a/nipype/pipeline/plugins/pbs.py b/nipype/pipeline/plugins/pbs.py index 0738638765..cc5bbed93b 100644 --- a/nipype/pipeline/plugins/pbs.py +++ b/nipype/pipeline/plugins/pbs.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- """Parallel workflow execution via PBS/Torque """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import str, open - import os from time import sleep diff --git a/nipype/pipeline/plugins/pbsgraph.py b/nipype/pipeline/plugins/pbsgraph.py index 68fc651f5f..9b6e9da755 100644 --- a/nipype/pipeline/plugins/pbsgraph.py +++ b/nipype/pipeline/plugins/pbsgraph.py @@ -1,9 +1,5 @@ """Parallel workflow execution via PBS/Torque """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open - import os import sys diff --git a/nipype/pipeline/plugins/semaphore_singleton.py b/nipype/pipeline/plugins/semaphore_singleton.py index 96dfe657bd..fe25cf2c61 100644 --- a/nipype/pipeline/plugins/semaphore_singleton.py +++ b/nipype/pipeline/plugins/semaphore_singleton.py @@ -1,5 +1,3 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) import threading semaphore = threading.Semaphore(0) diff --git a/nipype/pipeline/plugins/sge.py b/nipype/pipeline/plugins/sge.py index a4ce28297c..61b127e188 100644 --- a/nipype/pipeline/plugins/sge.py +++ b/nipype/pipeline/plugins/sge.py @@ -1,11 +1,6 @@ # -*- coding: utf-8 -*- """Parallel workflow execution via SGE """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) - -from builtins import object - import os import pwd import re diff --git a/nipype/pipeline/plugins/sgegraph.py b/nipype/pipeline/plugins/sgegraph.py index fa07d6a436..06e5719654 100644 --- a/nipype/pipeline/plugins/sgegraph.py +++ b/nipype/pipeline/plugins/sgegraph.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- """Parallel workflow execution via SGE """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open - import os import sys diff --git a/nipype/pipeline/plugins/slurm.py b/nipype/pipeline/plugins/slurm.py index 4645e52fba..ffcbc42b63 100644 --- a/nipype/pipeline/plugins/slurm.py +++ b/nipype/pipeline/plugins/slurm.py @@ -5,10 +5,6 @@ Parallel workflow execution with SLURM ''' -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open - import os import re from time import sleep diff --git a/nipype/pipeline/plugins/slurmgraph.py b/nipype/pipeline/plugins/slurmgraph.py index b4013163cb..1b62177457 100644 --- a/nipype/pipeline/plugins/slurmgraph.py +++ b/nipype/pipeline/plugins/slurmgraph.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- """Parallel workflow execution via SLURM """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open - import os import sys diff --git a/nipype/pipeline/plugins/somaflow.py b/nipype/pipeline/plugins/somaflow.py index 174b277c6f..e31a901169 100644 --- a/nipype/pipeline/plugins/somaflow.py +++ b/nipype/pipeline/plugins/somaflow.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- """Parallel workflow execution via PBS/Torque """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os import sys diff --git a/nipype/pipeline/plugins/tests/test_callback.py b/nipype/pipeline/plugins/tests/test_callback.py index 6b9525071e..b7eb827b74 100644 --- a/nipype/pipeline/plugins/tests/test_callback.py +++ b/nipype/pipeline/plugins/tests/test_callback.py @@ -3,9 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Tests for workflow callbacks """ - -from builtins import object - from time import sleep import pytest import nipype.interfaces.utility as niu diff --git a/nipype/pipeline/plugins/tests/test_legacymultiproc_nondaemon.py b/nipype/pipeline/plugins/tests/test_legacymultiproc_nondaemon.py index a83d426ada..3c4e673f55 100644 --- a/nipype/pipeline/plugins/tests/test_legacymultiproc_nondaemon.py +++ b/nipype/pipeline/plugins/tests/test_legacymultiproc_nondaemon.py @@ -3,10 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Testing module for functions and classes from multiproc.py """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range, open - # Import packages import os import sys diff --git a/nipype/pipeline/plugins/tools.py b/nipype/pipeline/plugins/tools.py index ebf023b787..c06d5eea63 100644 --- a/nipype/pipeline/plugins/tools.py +++ b/nipype/pipeline/plugins/tools.py @@ -3,10 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Common graph operations for execution """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open - import os import getpass from socket import gethostname @@ -16,7 +12,7 @@ from traceback import format_exception from ... import logging -from ...utils.filemanip import savepkl, crash2txt, makedirs, FileNotFoundError +from ...utils.filemanip import savepkl, crash2txt logger = logging.getLogger('nipype.workflow') @@ -59,7 +55,7 @@ def report_crash(node, traceback=None, hostname=None): str(uuid.uuid4())) crashdir = node.config['execution'].get('crashdump_dir', os.getcwd()) - makedirs(crashdir, exist_ok=True) + os.makedirs(crashdir, exist_ok=True) crashfile = os.path.join(crashdir, crashfile) if node.config['execution']['crashfile_format'].lower() in ('text', 'txt', '.txt'): @@ -132,8 +128,7 @@ def create_pyscript(node, updatehash=False, store_exception=True): batchdir = '%s' from nipype.utils.filemanip import loadpkl, savepkl try: - if not sys.version_info < (2, 7): - from collections import OrderedDict + from collections import OrderedDict config_dict=%s config.update_config(config_dict) ## Only configure matplotlib if it was successfully imported, diff --git a/nipype/pkg_info.py b/nipype/pkg_info.py index 8492d237d7..7367e4d8e5 100644 --- a/nipype/pkg_info.py +++ b/nipype/pkg_info.py @@ -1,10 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) - -from future import standard_library -standard_library.install_aliases() -from builtins import open import configparser import os @@ -12,7 +6,6 @@ import subprocess COMMIT_INFO_FNAME = 'COMMIT_INFO.txt' -PY3 = sys.version_info[0] >= 3 def pkg_commit_hash(pkg_path): @@ -51,10 +44,7 @@ def pkg_commit_hash(pkg_path): raise IOError('Missing commit info file %s' % pth) cfg_parser = configparser.RawConfigParser() with open(pth, encoding='utf-8') as fp: - if sys.version_info >= (3, 2): - cfg_parser.read_file(fp) - else: - cfg_parser.readfp(fp) + cfg_parser.read_file(fp) archive_subst = cfg_parser.get('commit hash', 'archive_subst_hash') if not archive_subst.startswith('$Format'): # it has been substituted return 'archive substitution', archive_subst @@ -70,9 +60,7 @@ def pkg_commit_hash(pkg_path): shell=True) repo_commit, _ = proc.communicate() if repo_commit: - if PY3: - repo_commit = repo_commit.decode() - return 'repository', repo_commit.strip() + return 'repository', repo_commit.decode().strip() return '(none found)', '' @@ -91,8 +79,6 @@ def get_pkg_info(pkg_path): ''' src, hsh = pkg_commit_hash(pkg_path) from .info import VERSION - if not PY3: - src, hsh, VERSION = src.encode(), hsh.encode(), VERSION.encode() import networkx import nibabel import numpy diff --git a/nipype/scripts/cli.py b/nipype/scripts/cli.py index 482f359aae..ae21a789cb 100644 --- a/nipype/scripts/cli.py +++ b/nipype/scripts/cli.py @@ -1,8 +1,6 @@ #!python # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: -from io import open - import click from .instance import list_interfaces diff --git a/nipype/scripts/utils.py b/nipype/scripts/utils.py index ce9acde7fd..0315bfd64e 100644 --- a/nipype/scripts/utils.py +++ b/nipype/scripts/utils.py @@ -2,10 +2,8 @@ """ Utilities for the CLI functions. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import bytes, str + import re import click diff --git a/nipype/sphinxext/__init__.py b/nipype/sphinxext/__init__.py index 5f8ba4da2b..7f877fb023 100644 --- a/nipype/sphinxext/__init__.py +++ b/nipype/sphinxext/__init__.py @@ -2,5 +2,3 @@ # -*- 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, absolute_import, - unicode_literals) diff --git a/nipype/sphinxext/plot_workflow.py b/nipype/sphinxext/plot_workflow.py index 7fa0769401..740c121926 100644 --- a/nipype/sphinxext/plot_workflow.py +++ b/nipype/sphinxext/plot_workflow.py @@ -106,8 +106,6 @@ Provide a customized template for preparing restructured text. """ -from __future__ import print_function, division, absolute_import, unicode_literals - import sys import os import shutil @@ -144,27 +142,6 @@ def format_template(template, **kw): except ImportError as e: missing_imports.append(str(e)) -from builtins import str, bytes - -PY2 = sys.version_info[0] == 2 -PY3 = sys.version_info[0] == 3 - - -def _mkdirp(folder): - """ - Equivalent to bash's mkdir -p - """ - if sys.version_info > (3, 4, 1): - os.makedirs(folder, exist_ok=True) - return folder - - try: - os.makedirs(folder) - except OSError as exc: - if exc.errno != EEXIST or not os.path.isdir(folder): - raise - - return folder def wf_directive(name, arguments, options, content, lineno, content_offset, @@ -276,8 +253,7 @@ def setup(app): app.add_config_value('wf_working_directory', None, True) app.add_config_value('wf_template', None, True) - app.connect('doctree-read'.encode() - if PY2 else 'doctree-read', mark_wf_labels) + app.connect('doctree-read', mark_wf_labels) metadata = {'parallel_read_safe': True, 'parallel_write_safe': True} return metadata @@ -458,11 +434,7 @@ def run_code(code, code_path, ns=None, function_name=None): # Redirect stdout stdout = sys.stdout - if PY3: - sys.stdout = io.StringIO() - else: - from cStringIO import StringIO - sys.stdout = StringIO() + sys.stdout = io.StringIO() # Assign a do-nothing print function to the namespace. There # doesn't seem to be any other way to provide a way to (not) print @@ -748,7 +720,7 @@ def run(arguments, content, options, state_machine, state, lineno): state_machine.insert_input(total_lines, source=source_file_name) # copy image files to builder's output directory, if necessary - _mkdirp(dest_dir) + os.makedirs(dest_dir, exist_ok=True) for code_piece, images in results: for img in images: for fn in img.filenames(): diff --git a/nipype/testing/fixtures.py b/nipype/testing/fixtures.py index 6d8b3b0874..dabf3b3307 100644 --- a/nipype/testing/fixtures.py +++ b/nipype/testing/fixtures.py @@ -4,17 +4,11 @@ """ Pytest fixtures used in tests. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) - import os import pytest import numpy as np import nibabel as nb -from io import open -from builtins import str - from nipype.utils.filemanip import ensure_list from nipype.interfaces.fsl import Info from nipype.interfaces.fsl.base import FSLCommand diff --git a/nipype/testing/utils.py b/nipype/testing/utils.py index 716b16da78..6c36ce514e 100644 --- a/nipype/testing/utils.py +++ b/nipype/testing/utils.py @@ -3,10 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Additional handy utilities for testing """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import range, object, open - import os import time import shutil @@ -14,7 +10,6 @@ import subprocess from subprocess import CalledProcessError from tempfile import mkdtemp -from future.utils import raise_from from ..utils.misc import package_check __docformat__ = 'restructuredtext' @@ -59,13 +54,13 @@ def __init__(self, size_in_mbytes=8, delay=0.5): subprocess.check_call( args=mkfs_args, stdout=self.dev_null, stderr=self.dev_null) except CalledProcessError as e: - raise_from(IOError("mkfs.vfat failed"), e) + raise IOError("mkfs.vfat failed") from e try: self.fusefat = subprocess.Popen( args=mount_args, stdout=self.dev_null, stderr=self.dev_null) except OSError as e: - raise_from(IOError("fusefat is not installed"), e) + raise IOError("fusefat is not installed") from e time.sleep(self.delay) diff --git a/nipype/utils/__init__.py b/nipype/utils/__init__.py index 4a0741e48e..6508602eb8 100644 --- a/nipype/utils/__init__.py +++ b/nipype/utils/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from .config import NUMPY_MMAP from .onetime import OneTimeProperty, setattr_on_read diff --git a/nipype/utils/config.py b/nipype/utils/config.py index c028ea326f..79515a5b7f 100644 --- a/nipype/utils/config.py +++ b/nipype/utils/config.py @@ -9,8 +9,6 @@ @author: Chris Filo Gorgolewski ''' -from __future__ import (print_function, division, unicode_literals, - absolute_import) import os import sys import errno @@ -20,15 +18,11 @@ import configparser import numpy as np -from builtins import bytes, str, object, open from simplejson import load, dump -from future import standard_library from .misc import str2bool from filelock import SoftFileLock -standard_library.install_aliases() - CONFIG_DEPRECATIONS = { 'profile_runtime': ('monitoring.enabled', '1.0'), 'filemanip_level': ('logging.utils_level', '1.0'), diff --git a/nipype/utils/docparse.py b/nipype/utils/docparse.py index 1df779f2ce..041e3ad5cf 100644 --- a/nipype/utils/docparse.py +++ b/nipype/utils/docparse.py @@ -13,10 +13,6 @@ docstring = docparse.get_doc(better.cmd, better.opt_map) """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import str, open, bytes - import subprocess from ..interfaces.base import CommandLine from .misc import is_container diff --git a/nipype/utils/draw_gantt_chart.py b/nipype/utils/draw_gantt_chart.py index 7a52205090..6a037d34e0 100644 --- a/nipype/utils/draw_gantt_chart.py +++ b/nipype/utils/draw_gantt_chart.py @@ -5,18 +5,12 @@ Module to draw an html gantt chart from logfile produced by ``nipype.utils.profiler.log_nodes_cb()`` """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) - # Import packages import sys import random import datetime import simplejson as json -from builtins import str, range, open -# Py2 compat: http://python-future.org/compatible_idioms.html#collections-counter-and-ordereddict -from future import standard_library -standard_library.install_aliases() + from collections import OrderedDict # Pandas @@ -27,8 +21,6 @@ 'install the pandas package') pass -PY3 = sys.version_info[0] > 2 - def create_event_dict(start_time, nodes_list): ''' @@ -322,10 +314,7 @@ def draw_resource_bar(start_time, finish_time, time_series, space_between_minutes = space_between_minutes / scale # Iterate through time series - if PY3: - ts_items = time_series.items() - else: - ts_items = time_series.iteritems() + ts_items = time_series.items() ts_len = len(time_series) for idx, (ts_start, amount) in enumerate(ts_items): @@ -561,5 +550,5 @@ def generate_gantt_chart(logfile, ''' # save file - with open(logfile + '.html', 'w' if PY3 else 'wb') as html_file: + with open(logfile + '.html', 'w') as html_file: html_file.write(html_string) diff --git a/nipype/utils/filemanip.py b/nipype/utils/filemanip.py index 6897beb19f..b0d6c4a0c1 100644 --- a/nipype/utils/filemanip.py +++ b/nipype/utils/filemanip.py @@ -3,8 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Miscellaneous file manipulation functions """ -from __future__ import print_function, division, unicode_literals, absolute_import - import sys import pickle import errno @@ -19,53 +17,20 @@ import shutil import contextlib import posixpath +from pathlib import Path import simplejson as json from time import sleep, time -from builtins import str, bytes, open - from .. import logging, config, __version__ as version from .misc import is_container -from future import standard_library - -standard_library.install_aliases() fmlogger = logging.getLogger("nipype.utils") -related_filetype_sets = [(".hdr", ".img", ".mat"), (".nii", ".mat"), (".BRIK", ".HEAD")] - -PY3 = sys.version_info[0] >= 3 - -try: - from builtins import FileNotFoundError, FileExistsError -except ImportError: # PY27 - - class FileNotFoundError(OSError): # noqa - """Defines the exception for Python 2.""" - - def __init__(self, path): - """Initialize the exception.""" - super(FileNotFoundError, self).__init__( - 2, "No such file or directory", "%s" % path - ) - - class FileExistsError(OSError): # noqa - """Defines the exception for Python 2.""" - - def __init__(self, path): - """Initialize the exception.""" - super(FileExistsError, self).__init__( - 17, "File or directory exists", "%s" % path - ) - - -USING_PATHLIB2 = False -try: - from pathlib import Path -except ImportError: - from pathlib2 import Path - - USING_PATHLIB2 = True +related_filetype_sets = [ + (".hdr", ".img", ".mat"), + (".nii", ".mat"), + (".BRIK", ".HEAD"), +] def _resolve_with_filenotfound(path, **kwargs): @@ -94,25 +59,6 @@ def path_resolve(path, strict=False): return path -def path_mkdir(path, mode=0o777, parents=False, exist_ok=False): - try: - return path.mkdir(mode=mode, parents=parents, exist_ok=exist_ok) - except TypeError: # PY27/PY34 - if parents: - return makedirs(str(path), mode=mode, exist_ok=exist_ok) - elif not exist_ok or not path.exists(): - return os.mkdir(str(path), mode=mode) - - -if not hasattr(Path, "write_text"): - # PY34 - Path does not have write_text - def _write_text(self, text): - with open(str(self), "w") as f: - f.write(text) - - Path.write_text = _write_text - - def split_filename(fname): """Split a filename into parts: path, base filename and extension. @@ -163,63 +109,6 @@ def split_filename(fname): return pth, fname, ext -def to_str(value): - """ - Manipulates ordered dicts before they are hashed (Py2/3 compat.) - - """ - if sys.version_info[0] > 2: - retval = str(value) - else: - retval = to_str_py27(value) - return retval - - -def to_str_py27(value): - """ - Encode dictionary for python 2 - """ - - if isinstance(value, dict): - entry = "{}: {}".format - retval = "{" - for key, val in list(value.items()): - if len(retval) > 1: - retval += ", " - kenc = repr(key) - if kenc.startswith(("u'", 'u"')): - kenc = kenc[1:] - venc = to_str_py27(val) - if venc.startswith(("u'", 'u"')): - venc = venc[1:] - retval += entry(kenc, venc) - retval += "}" - return retval - - istuple = isinstance(value, tuple) - if isinstance(value, (tuple, list)): - retval = "(" if istuple else "[" - nels = len(value) - for i, v in enumerate(value): - venc = to_str_py27(v) - if venc.startswith(("u'", 'u"')): - venc = venc[1:] - retval += venc - - if i < nels - 1: - retval += ", " - - if istuple and nels == 1: - retval += "," - retval += ")" if istuple else "]" - return retval - - retval = repr(value).decode() - if retval.startswith(("u'", 'u"')): - retval = retval[1:] - return retval - - def fname_presuffix(fname, prefix="", suffix="", newpath=None, use_ext=True): """Manipulates path and name of input filename @@ -680,8 +569,6 @@ def save_json(filename, data): """ mode = "w" - if sys.version_info[0] < 3: - mode = "wb" with open(filename, mode) as fp: json.dump(data, fp, sort_keys=True, indent=4) @@ -766,8 +653,6 @@ def loadpkl(infile): # Unpickling problems except Exception as e: if pkl_metadata and "version" in pkl_metadata: - from nipype import __version__ as version - if pkl_metadata["version"] != version: fmlogger.error( """\ @@ -878,31 +763,6 @@ def dist_is_editable(dist): return False -def makedirs(path, mode=0o777, exist_ok=False): - """ - Create path, if it doesn't exist. - - Parameters - ---------- - path : output directory to create - - """ - if not exist_ok: # The old makedirs - os.makedirs(path, mode=mode) - return path - - # this odd approach deals with concurrent directory cureation - if not op.exists(op.abspath(path)): - fmlogger.debug("Creating directory %s", path) - try: - os.makedirs(path, mode=mode) - except OSError: - fmlogger.debug("Problem creating directory %s", path) - if not op.exists(path): - raise OSError("Could not create directory %s" % path) - return path - - def emptydirs(path, noexist_ok=False): """ Empty an existing directory, without deleting it. Do not @@ -937,7 +797,7 @@ def emptydirs(path, noexist_ok=False): else: raise ex - makedirs(path) + os.makedirs(path) def silentrm(filename): @@ -979,27 +839,10 @@ def which(cmd, env=None, pathext=None): if env and "PATH" in env: path = env.get("PATH") - if sys.version_info >= (3, 3): - for ext in pathext: - filename = shutil.which(cmd + ext, path=path) - if filename: - return filename - return None - - def isexec(path): - return os.path.isfile(path) and os.access(path, os.X_OK) - for ext in pathext: - extcmd = cmd + ext - fpath, fname = os.path.split(extcmd) - if fpath: - if isexec(extcmd): - return extcmd - else: - for directory in path.split(os.pathsep): - filename = op.join(directory, extcmd) - if isexec(filename): - return filename + filename = shutil.which(cmd + ext, path=path) + if filename: + return filename return None @@ -1051,18 +894,12 @@ def canonicalize_env(env): if os.name != "nt": return env - # convert unicode to string for python 2 - if not PY3: - from future.utils import bytes_to_native_str out_env = {} for key, val in env.items(): if not isinstance(key, bytes): key = key.encode("utf-8") if not isinstance(val, bytes): val = val.encode("utf-8") - if not PY3: - key = bytes_to_native_str(key) - val = bytes_to_native_str(val) out_env[key] = val return out_env diff --git a/nipype/utils/functions.py b/nipype/utils/functions.py index 00b9412d5d..a36a7edfeb 100644 --- a/nipype/utils/functions.py +++ b/nipype/utils/functions.py @@ -3,8 +3,6 @@ Handles custom functions used in Function interface. Future imports are avoided to keep namespace as clear as possible. """ -from builtins import next, str -from future.utils import raise_from import inspect from textwrap import dedent @@ -41,7 +39,7 @@ def create_function_from_source(function_source, imports=None): "They cannot be declared either interactively or inside " "another function or inline in the connect string. Any " "imports should be done inside the function.") - raise_from(RuntimeError(msg), e) + raise RuntimeError(msg) from e ns_funcs = list(set(ns) - set(import_keys + ['__builtins__'])) assert len(ns_funcs) == 1, "Function or inputs are ill-defined" func = ns[ns_funcs[0]] diff --git a/nipype/utils/logger.py b/nipype/utils/logger.py index 2c8fe4607a..6acd76665c 100644 --- a/nipype/utils/logger.py +++ b/nipype/utils/logger.py @@ -1,8 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) - -from builtins import object # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: diff --git a/nipype/utils/matlabtools.py b/nipype/utils/matlabtools.py index bff9567ed5..c62627c2a8 100644 --- a/nipype/utils/matlabtools.py +++ b/nipype/utils/matlabtools.py @@ -2,10 +2,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: """ Useful Functions for working with matlab""" -from __future__ import (print_function, division, unicode_literals, - absolute_import) - -from builtins import range # Stdlib imports import os diff --git a/nipype/utils/misc.py b/nipype/utils/misc.py index 61730025ff..70011c447d 100644 --- a/nipype/utils/misc.py +++ b/nipype/utils/misc.py @@ -3,10 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Miscellaneous utility functions """ -from __future__ import (print_function, unicode_literals, division, - absolute_import) -from builtins import next, bytes, str - import os import sys import re @@ -16,8 +12,6 @@ from distutils.version import LooseVersion import numpy as np -from future.utils import raise_from -from future import standard_library try: from textwrap import indent as textwrap_indent except ImportError: @@ -30,9 +24,6 @@ def textwrap_indent(text, prefix): return prefix + prefix.join(splittext) -standard_library.install_aliases() - - def human_order_sorted(l): """Sorts string in human order (i.e. 'stat10' will go after 'stat2')""" @@ -179,14 +170,13 @@ def package_check(pkg_name, try: mod = __import__(pkg_name) except ImportError as e: - raise_from(exc_failed_import(msg), e) + raise exc_failed_import(msg) from e if not version: return try: have_version = mod.__version__ except AttributeError as e: - raise_from( - exc_failed_check('Cannot find version for %s' % pkg_name), e) + raise exc_failed_check('Cannot find version for %s' % pkg_name) from e if checker(have_version) < checker(version): raise exc_failed_check(msg) diff --git a/nipype/utils/nipype2boutiques.py b/nipype/utils/nipype2boutiques.py index 4f692a267b..14e9fb7f5d 100644 --- a/nipype/utils/nipype2boutiques.py +++ b/nipype/utils/nipype2boutiques.py @@ -1,8 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import str, open, bytes # This tool exports a Nipype interface in the Boutiques # (https://github.com/boutiques) JSON format. Boutiques tools # can be imported in CBRAIN (https://github.com/aces/cbrain) diff --git a/nipype/utils/nipype_cmd.py b/nipype/utils/nipype_cmd.py index 36fa69b3c1..2a610add1e 100644 --- a/nipype/utils/nipype_cmd.py +++ b/nipype/utils/nipype_cmd.py @@ -1,7 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import str import os import argparse import inspect diff --git a/nipype/utils/onetime.py b/nipype/utils/onetime.py index 6983bc5c0f..e9a905254b 100644 --- a/nipype/utils/onetime.py +++ b/nipype/utils/onetime.py @@ -17,10 +17,6 @@ [2] Python data model, http://docs.python.org/reference/datamodel.html """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) - -from builtins import object class OneTimeProperty(object): diff --git a/nipype/utils/profiler.py b/nipype/utils/profiler.py index 6380711baf..a9b8c926cb 100644 --- a/nipype/utils/profiler.py +++ b/nipype/utils/profiler.py @@ -4,9 +4,6 @@ """ Utilities to keep track of performance """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) - import os import threading from time import time @@ -15,7 +12,7 @@ except ImportError as exc: psutil = None -from builtins import open, range + from .. import config, logging proflogger = logging.getLogger('nipype.utils') diff --git a/nipype/utils/provenance.py b/nipype/utils/provenance.py index fb2306ee4b..cb11ff9326 100644 --- a/nipype/utils/provenance.py +++ b/nipype/utils/provenance.py @@ -1,11 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open, object, str, bytes - -# Py2 compat: http://python-future.org/compatible_idioms.html#collections-counter-and-ordereddict -from future import standard_library -standard_library.install_aliases() from collections import OrderedDict from copy import deepcopy diff --git a/nipype/utils/spm_docs.py b/nipype/utils/spm_docs.py index 12169b482b..d9e56064f2 100644 --- a/nipype/utils/spm_docs.py +++ b/nipype/utils/spm_docs.py @@ -2,10 +2,6 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: """Grab documentation from spm.""" -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from future.utils import raise_from - import os from ..interfaces import matlab @@ -52,7 +48,7 @@ def _strip_header(doc): try: index = doc.index(hdr) except ValueError as e: - raise_from(IOError('This docstring was not generated by Nipype!\n'), e) + raise IOError('This docstring was not generated by Nipype!\n') from e index += len(hdr) index += 1 diff --git a/nipype/utils/subprocess.py b/nipype/utils/subprocess.py index 5516482936..b29d575a37 100644 --- a/nipype/utils/subprocess.py +++ b/nipype/utils/subprocess.py @@ -3,8 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Miscellaneous utility functions """ -from __future__ import (print_function, unicode_literals, division, - absolute_import) import os import sys import gc @@ -17,8 +15,6 @@ from .. import logging -from builtins import range, object - iflogger = logging.getLogger('nipype.interface') diff --git a/nipype/utils/tests/test_cmd.py b/nipype/utils/tests/test_cmd.py index 0e16e0aad8..52861e9fb7 100644 --- a/nipype/utils/tests/test_cmd.py +++ b/nipype/utils/tests/test_cmd.py @@ -1,10 +1,4 @@ #!/usr/bin/env python -from __future__ import (print_function, division, unicode_literals, - absolute_import) - -from future import standard_library -standard_library.install_aliases() - import pytest import sys from contextlib import contextmanager @@ -12,8 +6,6 @@ from io import StringIO from ...utils import nipype_cmd -PY2 = sys.version_info[0] < 3 - @contextmanager def capture_sys_output(): @@ -41,10 +33,6 @@ def test_main_returns_2_on_empty(self): nipype_cmd: error: the following arguments are required: module, interface """ - if PY2: - msg = """usage: nipype_cmd [-h] module interface -nipype_cmd: error: too few arguments -""" assert stderr.getvalue() == msg assert stdout.getvalue() == '' diff --git a/nipype/utils/tests/test_config.py b/nipype/utils/tests/test_config.py index a3c0480b29..b52238da44 100644 --- a/nipype/utils/tests/test_config.py +++ b/nipype/utils/tests/test_config.py @@ -1,14 +1,11 @@ # -*- 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 import sys import pytest from nipype import config from mock import MagicMock -from builtins import object try: import xvfbwrapper diff --git a/nipype/utils/tests/test_filemanip.py b/nipype/utils/tests/test_filemanip.py index 3d9154db67..79707bf9b8 100644 --- a/nipype/utils/tests/test_filemanip.py +++ b/nipype/utils/tests/test_filemanip.py @@ -1,12 +1,10 @@ # -*- 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 unicode_literals -from builtins import open - import os import time import warnings +from pathlib import Path import mock import pytest @@ -16,8 +14,7 @@ check_forhash, _parse_mount_table, _cifs_table, on_cifs, copyfile, copyfiles, ensure_list, simplify_list, check_depends, split_filename, get_related_files, indirectory, - loadpkl, loadcrash, savepkl, FileNotFoundError, Path, - path_mkdir, path_resolve) + loadpkl, loadcrash, savepkl, path_resolve) def _ignore_atime(stat): @@ -600,20 +597,3 @@ def test_pickle(tmp_path, save_versioning): savepkl(pickle_fname, testobj, versioning=save_versioning) outobj = loadpkl(pickle_fname) assert outobj == testobj - - -def test_path_mkdir(tmpdir): - tmp_path = Path(tmpdir.strpath) - - # PY34: Leave as monkey-patch - Path.write_text(tmp_path / 'textfile', 'some text') - - with pytest.raises(OSError): - path_mkdir(tmp_path / 'no' / 'parents', parents=False) - - path_mkdir(tmp_path / 'no' / 'parents', parents=True) - - with pytest.raises(OSError): - path_mkdir(tmp_path / 'no' / 'parents', parents=False) - - path_mkdir(tmp_path / 'no' / 'parents', parents=True, exist_ok=True) diff --git a/nipype/utils/tests/test_functions.py b/nipype/utils/tests/test_functions.py index 377bfe338f..a933507c96 100644 --- a/nipype/utils/tests/test_functions.py +++ b/nipype/utils/tests/test_functions.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import sys import pytest from nipype.utils.functions import (getsource, create_function_from_source) @@ -27,7 +26,7 @@ def test_func_to_str_err(): def _print_statement(): try: - exec('print ""') + exec('print("")') return True except SyntaxError: return False @@ -41,7 +40,6 @@ def is_string(): assert is_string() == wrapped_func() -@pytest.mark.skipif(sys.version_info[0] > 2, reason="breaks python 3") -def test_func_print_py2(): +def test_func_print(): wrapped_func = create_function_from_source(getsource(_print_statement)) assert wrapped_func() diff --git a/nipype/utils/tests/test_misc.py b/nipype/utils/tests/test_misc.py index 8896039763..7c04a2a361 100644 --- a/nipype/utils/tests/test_misc.py +++ b/nipype/utils/tests/test_misc.py @@ -1,12 +1,8 @@ # -*- 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 standard_library -standard_library.install_aliases() - import os from shutil import rmtree -from builtins import next import pytest diff --git a/nipype/utils/tests/test_nipype2boutiques.py b/nipype/utils/tests/test_nipype2boutiques.py index 19735df6b5..a86a8971e3 100644 --- a/nipype/utils/tests/test_nipype2boutiques.py +++ b/nipype/utils/tests/test_nipype2boutiques.py @@ -1,11 +1,9 @@ # -*- 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 standard_library from ..nipype2boutiques import generate_boutiques_descriptor from nipype.testing import example_data import json -standard_library.install_aliases() def test_generate(): diff --git a/nipype/utils/tests/test_provenance.py b/nipype/utils/tests/test_provenance.py index 1d7233907a..cc48e899c5 100644 --- a/nipype/utils/tests/test_provenance.py +++ b/nipype/utils/tests/test_provenance.py @@ -1,11 +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 unicode_literals -from builtins import str, bytes -from future import standard_library -standard_library.install_aliases() - import os from nipype.utils.provenance import ProvStore, safe_encode diff --git a/nipype/utils/tmpdirs.py b/nipype/utils/tmpdirs.py index 73f0c4ecc4..4752514e8f 100644 --- a/nipype/utils/tmpdirs.py +++ b/nipype/utils/tmpdirs.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import object + # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: import os diff --git a/setup.cfg b/setup.cfg index 3c6e79cf31..bf1d5a3c1b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,2 @@ [bdist_wheel] -universal=1 +python-tag=py3 diff --git a/setup.py b/setup.py index 72ba59d904..b4239da30b 100755 --- a/setup.py +++ b/setup.py @@ -16,15 +16,11 @@ from glob import glob import os from os.path import join as pjoin -from io import open # Commit hash writing, and dependency checking from setuptools.command.build_py import build_py -PY3 = sys.version_info[0] >= 3 - - class BuildWithCommitInfoCommand(build_py): """ Return extended build command class for recording commit @@ -70,20 +66,14 @@ def run(self): stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) - repo_commit, _ = proc.communicate() - # Fix for python 3 - if PY3: - repo_commit = repo_commit.decode() + repo_commit = proc.communicate()[0].decode() # We write the installation commit even if it's empty cfg_parser = configparser.RawConfigParser() cfg_parser.read(pjoin('nipype', 'COMMIT_INFO.txt')) cfg_parser.set('commit hash', 'install_hash', repo_commit.strip()) out_pth = pjoin(self.build_lib, 'nipype', 'COMMIT_INFO.txt') - if PY3: - cfg_parser.write(open(out_pth, 'wt')) - else: - cfg_parser.write(open(out_pth, 'wb')) + cfg_parser.write(open(out_pth, 'wt')) def main(): diff --git a/tools/apigen.py b/tools/apigen.py index 13609ba07f..8388dc7a59 100644 --- a/tools/apigen.py +++ b/tools/apigen.py @@ -20,10 +20,6 @@ PyMVPA project, which we've adapted for NIPY use. PyMVPA is an MIT-licensed project. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import object, open - import os import re diff --git a/tools/build_interface_docs.py b/tools/build_interface_docs.py index 37b99cb476..7da2f40e0d 100755 --- a/tools/build_interface_docs.py +++ b/tools/build_interface_docs.py @@ -3,7 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Script to auto-generate interface docs. """ -from __future__ import print_function, unicode_literals # stdlib imports import os import sys diff --git a/tools/build_modref_templates.py b/tools/build_modref_templates.py index 18a0372824..0b06ea9235 100755 --- a/tools/build_modref_templates.py +++ b/tools/build_modref_templates.py @@ -3,8 +3,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Script to auto-generate our API docs. """ - -from __future__ import print_function # stdlib imports import os import sys diff --git a/tools/checkspecs.py b/tools/checkspecs.py index 3eebb0569c..cf5b616270 100644 --- a/tools/checkspecs.py +++ b/tools/checkspecs.py @@ -2,9 +2,6 @@ # vi: set ft=python sts=4 ts=4 sw=4 et: """Attempt to check each interface in nipype """ -from __future__ import print_function, unicode_literals -from builtins import object, str, bytes, open - # Stdlib imports import os import re @@ -229,7 +226,6 @@ def test_specs(self, uri): if not os.path.exists(nonautotest): cmd = [ '# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT', - 'from __future__ import unicode_literals', 'from ..%s import %s' % (uri.split('.')[-1], c), '' ] cmd.append('\ndef test_%s_inputs():' % c) diff --git a/tools/ex2rst b/tools/ex2rst index 140b7d5aa5..df24df0340 100755 --- a/tools/ex2rst +++ b/tools/ex2rst @@ -11,10 +11,6 @@ # ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ## """Helper to automagically generate ReST versions of examples""" -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open, str - import os import sys import re diff --git a/tools/github.py b/tools/github.py index f33beb48a3..14aa4a6620 100644 --- a/tools/github.py +++ b/tools/github.py @@ -1,8 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from builtins import open import http.client import inspect import simplejson diff --git a/tools/gitwash_dumper.py b/tools/gitwash_dumper.py index e5a26ba7a4..c86a0689bd 100755 --- a/tools/gitwash_dumper.py +++ b/tools/gitwash_dumper.py @@ -1,9 +1,5 @@ #!/usr/bin/env python ''' Checkout gitwash repo into directory and do search replace on name ''' -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open - import os from os.path import join as pjoin import shutil diff --git a/tools/interfacedocgen.py b/tools/interfacedocgen.py index f73375827f..cf85949077 100644 --- a/tools/interfacedocgen.py +++ b/tools/interfacedocgen.py @@ -20,9 +20,6 @@ PyMVPA project, which we've adapted for NIPY use. PyMVPA is an MIT-licensed project.""" -from __future__ import print_function, unicode_literals -from builtins import object, open - # Stdlib imports import inspect import os diff --git a/tools/make_examples.py b/tools/make_examples.py index fe9f7880c8..32a7ca31b5 100755 --- a/tools/make_examples.py +++ b/tools/make_examples.py @@ -3,9 +3,6 @@ This also creates the index.rst file appropriately, makes figures, etc. """ -from __future__ import (print_function, division, unicode_literals, - absolute_import) -from builtins import open from past.builtins import execfile # ----------------------------------------------------------------------------- # Library imports diff --git a/tools/run_examples.py b/tools/run_examples.py index 96847cbe25..11b69db6c0 100644 --- a/tools/run_examples.py +++ b/tools/run_examples.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import print_function import os import sys from shutil import rmtree