Merge branch 'maint/2.3.x'

Author: effigies

.travis.yml

@@ -16,6 +16,7 @@ env:
         - DEPENDS="six numpy scipy matplotlib h5py pillow pydicom"
         - OPTIONAL_DEPENDS=""
         - INSTALL_TYPE="setup"
+        - CHECK_TYPE="test"
         - EXTRA_WHEELS="https://5cf40426d9f06eb7461d-6fe47d9331aba7cd62fc36c7196769e4.ssl.cf2.rackcdn.com"
         - PRE_WHEELS="https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"
         - EXTRA_PIP_FLAGS="--find-links=$EXTRA_WHEELS"
@@ -32,10 +33,18 @@ matrix:
     - python: 2.7
       env:
         - COVERAGE=1
+    - python: 3.5
+      env:
+        - COVERAGE=1
     # Absolute minimum dependencies
     - python: 2.7
       env:
         - DEPENDS="numpy==1.7.1"
+    # Absolute minimum dependencies
+    - python: 2.7
+      env:
+        - DEPENDS="numpy==1.7.1"
+        - CHECK_TYPE="import"
     # Absolute minimum dependencies plus oldest MPL
     # Check these against:
     # nibabel/info.py
@@ -60,10 +69,6 @@ matrix:
     - python: 3.5
       env:
         - EXTRA_PIP_FLAGS="$PRE_PIP_FLAGS"
-    # Documentation doctests
-    - python: 2.7
-      env:
-        - DOC_DOC_TEST=1
     - python: 2.7
       env:
         - INSTALL_TYPE=sdist
@@ -75,13 +80,17 @@ matrix:
         - INSTALL_TYPE=requirements
     - python: 2.7
       env:
-        - STYLE=1
+        - CHECK_TYPE="style"
     - python: 3.5
       env:
-        - STYLE=1
+        - CHECK_TYPE="style"
+    # Documentation doctests
+    - python: 2.7
+      env:
+        - CHECK_TYPE="doc_doctests"
     - python: 3.5
       env:
-        - DOC_DOC_TEST=1
+        - CHECK_TYPE="doc_doctests"
     # Run tests with indexed_gzip present
     - python: 2.7
       env:
@@ -97,7 +106,12 @@ before_install:
     - source venv/bin/activate
     - python --version # just to check
     - pip install -U pip setuptools>=27.0 wheel
-    - retry pip install nose flake8 mock  # always
+    - if [ "${CHECK_TYPE}" == "test" ]; then
+      retry pip install nose mock;
+      fi
+    - if [ "${CHECK_TYPE}" == "style" ]; then
+      retry pip install flake8;
+      fi
     - pip install $EXTRA_PIP_FLAGS $DEPENDS $OPTIONAL_DEPENDS
     - if [ "${COVERAGE}" == "1" ]; then
       pip install coverage;
@@ -126,25 +140,29 @@ install:
 # command to run tests, e.g. python setup.py test
 script:
     - |
-      if [ "${STYLE}" == "1" ]; then
+      if [ "${CHECK_TYPE}" == "style" ]; then
           # Run styles only on core nibabel code.
           flake8 nibabel
-      else
+      elif [ "${CHECK_TYPE}" == "import" ]; then
+          # Import nibabel without attempting to test
+          # Allows us to check missing dependencies masked by testing libraries
+          python -c 'import nibabel; print(nibabel.__version__)'
+      elif [ "${CHECK_TYPE}" == "doc_doctests" ]; then
+          cd doc
+          pip install -r ../doc-requirements.txt
+          make html;
+          make doctest;
+      elif [ "${CHECK_TYPE}" == "test" ]; then
           # Change into an innocuous directory and find tests from installation
           mkdir for_testing
           cd for_testing
           if [ "${COVERAGE}" == "1" ]; then
               cp ../.coveragerc .;
               COVER_ARGS="--with-coverage --cover-package nibabel";
           fi
-          if [ "$DOC_DOC_TEST" == "1" ]; then
-              cd ../doc;
-              pip install -r ../doc-requirements.txt
-              make html;
-              make doctest;
-          else
-              nosetests --with-doctest $COVER_ARGS nibabel;
-          fi
+          nosetests --with-doctest $COVER_ARGS nibabel;
+      else
+          false
       fi
 after_success:
     - if [ "${COVERAGE}" == "1" ]; then coveralls; codecov; fi

Changelog

@@ -24,7 +24,14 @@ Gerhard (SG), Eric Larson (EL), Yaroslav Halchenko (YOH) and Chris Cheng (CC).
 
 References like "pr/298" refer to github pull request numbers.
 
-2.3.2 (Wedmesday 2 January 2019)
+2.3.3 (Wednesday 16 January 2019)
+=================================
+
+Maintenance
+-----------
+* Restore ``six`` dependency (pr/714) (CM, reviewed by Gael Varoquaux, MB)
+
+2.3.2 (Wednesday 2 January 2019)
 ================================
 
 Enhancements

nibabel/info.py

@@ -210,4 +210,5 @@ def cmp_pkg_version(version_str, pkg_version_str=__version__):
 VERSION = __version__
 PROVIDES = ["nibabel", 'nisext']
 REQUIRES = ["numpy>=%s" % NUMPY_MIN_VERSION,
+            "six>=%s" % SIX_MIN_VERSION,
             'bz2file; python_version < "3.0"']