Merge pull request #787 from effigies/maint/purge_python2

MAINT: Require Python >= 3.5, purge Python 2 compatibility

Author: effigies

.travis.yml

@@ -22,76 +22,59 @@ env:
         - EXTRA_PIP_FLAGS="--find-links=$EXTRA_WHEELS"
         - PRE_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS"
 python:
-    - 3.5
     - 3.6
     - 3.7
 matrix:
   include:
-    - python: 3.4
-      dist: trusty
-      sudo: false
     # Absolute minimum dependencies
-    - python: 2.7
+    - python: 3.5
       env:
-        - DEPENDS="numpy==1.8 setuptools==30.3.0"
+        - DEPENDS="-r min-requirements.txt setuptools==30.3.0"
     # Absolute minimum dependencies
-    - python: 2.7
+    - python: 3.5
       env:
-        - DEPENDS="numpy==1.8"
+        - DEPENDS="-r min-requirements.txt"
         - CHECK_TYPE="import"
     # Absolute minimum dependencies plus oldest MPL
     # Check these against:
     # nibabel/info.py
     # doc/source/installation.rst
     # requirements.txt
-    - python: 2.7
+    - python: 3.5
       env:
-        - DEPENDS="numpy==1.8 matplotlib==1.3.1"
+        - DEPENDS="-r min-requirements.txt matplotlib==1.3.1"
     # Minimum pydicom dependency
-    - python: 2.7
+    - python: 3.5
       env:
-        - DEPENDS="numpy==1.8 pydicom==0.9.9 pillow==2.6"
+        - DEPENDS="-r min-requirements.txt pydicom==0.9.9 pillow==2.6"
     # pydicom master branch
     - python: 3.5
       env:
         - DEPENDS="numpy git+https://github.com/pydicom/pydicom.git@master"
-    # test 2.7 against pre-release builds of everything
-    - python: 2.7
-      env:
-        - EXTRA_PIP_FLAGS="$PRE_PIP_FLAGS"
     # test 3.5 against pre-release builds of everything
     - python: 3.5
       env:
         - EXTRA_PIP_FLAGS="$PRE_PIP_FLAGS"
-    - python: 2.7
+    - python: 3.5
       env:
         - INSTALL_TYPE=sdist
-    - python: 2.7
+    - python: 3.5
       env:
         - INSTALL_TYPE=wheel
-    - python: 2.7
+    - python: 3.5
       env:
         - INSTALL_TYPE=requirements
-    - python: 2.7
+    - python: 3.5
       env:
         - INSTALL_TYPE=archive
-    - python: 2.7
-      env:
-        - CHECK_TYPE="style"
     - python: 3.5
       env:
         - CHECK_TYPE="style"
     # Documentation doctests
-    - python: 2.7
-      env:
-        - CHECK_TYPE="doc_doctests"
     - python: 3.5
       env:
         - CHECK_TYPE="doc_doctests"
     # Run tests with indexed_gzip present
-    - python: 2.7
-      env:
-        - OPTIONAL_DEPENDS="indexed_gzip"
     - python: 3.5
       env:
         - OPTIONAL_DEPENDS="indexed_gzip"

COPYING

@@ -218,34 +218,3 @@ the PDDL version 1.0 available at http://opendatacommons.org/licenses/pddl/1.0/
 
 is courtesy of the University of Massachusetts Medical School, also released
 under the PDDL.
-
-
-Six
---------------------
-
-In ``nibabel/externals/six.py``
-
-Copied from: https://pypi.python.org/packages/source/s/six/six-1.3.0.tar.gz#md5=ec47fe6070a8a64c802363d2c2b1e2ee
-
-::
-
-    Copyright (c) 2010-2013 Benjamin Peterson
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy of
-    this software and associated documentation files (the "Software"), to deal in
-    the Software without restriction, including without limitation the rights to
-    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-    the Software, and to permit persons to whom the Software is furnished to do so,
-    subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-    FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-

doc/source/installation.rst

@@ -81,14 +81,10 @@ is for you.
 Requirements
 ------------
 
-.. check these against:
-    nibabel/info.py
-    requirements.txt
-    .travis.yml
-
-*  Python_ 2.7, or >= 3.4
-*  NumPy_ 1.8 or greater
-*  Six_ 1.3 or greater
+.. check these against setup.cfg
+
+*  Python_ 3.5.1 or greater
+*  NumPy_ 1.12 or greater
 *  SciPy_ (optional, for full SPM-ANALYZE support)
 *  PyDICOM_ 0.9.9 or greater (optional, for DICOM support)
 *  `Python Imaging Library`_ (optional, for PNG conversion in DICOMFS)

doc/source/scripts/make_coord_examples.py

@@ -15,7 +15,6 @@
 * someones_epi.nii.gz (pretend single EPI volume)
 * someones_anatomy.nii.gz (pretend single subject structural)
 """
-from __future__ import division, print_function
 
 import math
 

doc/tools/build_modref_templates.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 """Script to auto-generate our API docs.
 """
-from __future__ import print_function, division
 
 # stdlib imports
 import sys

min-requirements.txt

@@ -0,0 +1,2 @@
+# Auto-generated by tools/update_requirements.py
+numpy ==1.12

nibabel/affines.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 
-from six.moves import reduce
+from functools import reduce
 
 
 class AffineError(ValueError):

nibabel/arraywriters.py

@@ -28,7 +28,6 @@ def __init__(self, array, out_dtype=None)
 something else to make sense of conversions between float and int, or between
 larger ints and smaller.
 """
-from __future__ import division, absolute_import
 
 import warnings
 

nibabel/benchmarks/bench_array_to_file.py

@@ -13,7 +13,6 @@
 
     nosetests -s --match '(?:^|[\\b_\\.//-])[Bb]ench' /path/to/bench_load_save.py
 """
-from __future__ import division, print_function
 
 import sys
 from io import BytesIO  # NOQA

nibabel/benchmarks/bench_fileslice.py

@@ -11,7 +11,6 @@
 
     nosetests -s --match '(?:^|[\\b_\\.//-])[Bb]ench' /path/to/bench_fileslice.py
 """
-from __future__ import division, print_function
 
 import sys
 from timeit import timeit