Skip to content

MNT: Drop Python 2 support #2654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 42 commits into from
Nov 13, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
1108430
CI: Drop Python 2 tests
effigies Jul 25, 2018
4a84a02
RF: Remove builtins
effigies Jul 25, 2018
9e47ec0
RF: Drop one-line __future__ imports
effigies Jul 25, 2018
06ecbe4
RF: Remove two-line __future__ imports
effigies Jul 25, 2018
b90f7d5
MAINT: Update version, supported Python versions
effigies Jul 25, 2018
b5ef915
FIX: Dangling import
effigies Jul 25, 2018
e968b8d
RF: Drop imports in checkspecs
effigies Jul 25, 2018
7a0e638
MAINT: make specs
effigies Jul 25, 2018
fa347ae
CI: Drop 2.7, add 3.7-dev on Travis
effigies Jul 25, 2018
f25cfc0
RF: Purge PY2/PY3 indicators
effigies Jul 25, 2018
323663f
RF: Purge "from io import open"
effigies Jul 25, 2018
e2dc9f8
DOC: Suggest raise from syntax
effigies Jul 25, 2018
9517c5a
TEST: Drop legacy auto tests
effigies Jul 26, 2018
f4f7865
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Jul 30, 2018
421600b
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Aug 13, 2018
1e5344e
CI: Build Python 3 wheels only
effigies Aug 13, 2018
055a59f
FIX: Run decode on bytes, not tuple
effigies Aug 13, 2018
938cdf4
CI: Do not install future, remove futures check
effigies Aug 13, 2018
f31416a
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Aug 30, 2018
e990c69
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Sep 24, 2018
2cfcd5a
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Oct 11, 2018
dbfaf7e
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Nov 14, 2018
9880669
Merge branch 'master' into dev/2.0
effigies Dec 17, 2018
83e4dc9
PY3: Drop future/builtins imports
effigies Dec 17, 2018
e057971
MAINT: Minimum python version > 3.2
effigies Dec 17, 2018
b0d464c
RF: Drop various remaining compatibilities for Python < 3.5
effigies Dec 17, 2018
be2d8c5
RF: Drop to_str, makedirs compatibility functions
effigies Dec 17, 2018
5ab2fa0
FIX: import os - mistakenly dropped
effigies Dec 17, 2018
dc89681
FIX: os.makedirs does not return directory
effigies Dec 17, 2018
80ed64d
Merge pull request #2831 from effigies/dev/2/min_version
effigies Jan 1, 2019
f112c58
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Jan 28, 2019
d997694
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Feb 25, 2019
375d00f
Merge branch 'master' into dev/2.0
effigies May 9, 2019
08cd3d3
MAINT: Sort dependencies
effigies Aug 21, 2019
f464954
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Aug 21, 2019
7baa6d3
PY3: Remove PY2 str hack
effigies Aug 21, 2019
797841b
Merge branch 'master' into dev/2.0
effigies Oct 8, 2019
72ac8a5
MNT: Missed Py2 cleanups
effigies Oct 8, 2019
7b9c639
MNT: Drop Py2 compatibility for tools/
effigies Oct 8, 2019
497b44d
STY: Black files pre-merge
effigies Nov 12, 2019
49cc0a7
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Nov 12, 2019
39fbd54
FIX: Missed merge issue
effigies Nov 12, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
RF: Remove builtins
  • Loading branch information
effigies committed Jul 25, 2018
commit 4a84a0275eaf207b951ee309b84d1a8fdba002c9
3 changes: 0 additions & 3 deletions nipype/__init__.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 0 additions & 4 deletions nipype/algorithms/confounds.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions nipype/algorithms/icc.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 0 additions & 4 deletions nipype/algorithms/mesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions nipype/algorithms/metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 2 additions & 8 deletions nipype/algorithms/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -794,9 +789,8 @@ def _run_interface(self, runtime):
try:
import pandas as pd
except ImportError as e:
raise_from(
ImportError('This interface requires pandas '
'(http://pandas.pydata.org/) to run.'), e)
raise ImportError('This interface requires pandas '
'(http://pandas.pydata.org/) to run.') from e

try:
import lockfile as pl
Expand Down
4 changes: 0 additions & 4 deletions nipype/algorithms/modelgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@

* SpecifyModel: allows specification of sparse and non-sparse models
"""
from __future__ import (print_function, division, unicode_literals,
absolute_import)
from builtins import range, str, bytes, int

from copy import deepcopy
import os

Expand Down
4 changes: 0 additions & 4 deletions nipype/algorithms/rapidart.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions nipype/algorithms/stats.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion nipype/algorithms/tests/test_icc_anova.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from __future__ import division
import numpy as np
from nipype.algorithms.icc import ICC_rep_anova

Expand Down
1 change: 0 additions & 1 deletion nipype/algorithms/tests/test_normalize_tpms.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions nipype/algorithms/tests/test_rapidart.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 0 additions & 4 deletions nipype/caching/memory.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions nipype/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +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. An empty version_extra corresponds to a
Expand Down
2 changes: 0 additions & 2 deletions nipype/interfaces/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions nipype/interfaces/afni/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +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 builtins import object, str
from future.utils import raise_from

import os
from sys import platform
from distutils import spawn
Expand Down Expand Up @@ -63,7 +58,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):
Expand Down
4 changes: 0 additions & 4 deletions nipype/interfaces/afni/preprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
# 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

Expand Down
4 changes: 0 additions & 4 deletions nipype/interfaces/afni/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,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
Expand Down
4 changes: 0 additions & 4 deletions nipype/interfaces/ants/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading