Merge remote-tracking branch 'upstream/master' into pytest

Author: effigies

.travis.yml

@@ -61,15 +61,28 @@ jobs:
     - python: 3.7
       env:
         - EXTRA_PIP_FLAGS="$PRE_PIP_FLAGS"
+    # OSX Python support is basically accidental. Take whatever version we can
+    # get and test with full dependencies...
+    - os: osx
+      language: minimal
+    # and pre-releases. No min-requirements.txt because we can't assume a wheel that old.
+    - os: osx
+      language: minimal
+      env:
+        - EXTRA_PIP_FLAGS="$PRE_PIP_FLAGS"
+    # Test that PyPI installs from source pass
     - python: 3.5
       env:
         - INSTALL_TYPE=sdist
+    # Wheels (binary distributions)
     - python: 3.5
       env:
         - INSTALL_TYPE=wheel
+    # Install from git archive (e.g., https://github.com/nipy/nibabel/archive/master.zip)
     - python: 3.5
       env:
         - INSTALL_TYPE=archive
+    # Run flake8... Might not be needed now we have pep8speaks
     - python: 3.5
       env:
         - CHECK_TYPE="style"
@@ -80,42 +93,42 @@ jobs:
 
 # Set up virtual environment, build package, build from depends
 before_install:
-    - travis_retry python -m pip install --upgrade pip virtualenv
-    - virtualenv --python=python venv
+    - travis_retry python3 -m pip install --upgrade pip virtualenv
+    - virtualenv --python=python3 venv
     - source venv/bin/activate
-    - python --version # just to check
-    - travis_retry pip install -U $SETUP_REQUIRES
+    - python3 --version # just to check
+    - travis_retry python3 -m pip install -U $SETUP_REQUIRES
     - |
       if [ "$INSTALL_TYPE" == "sdist" ]; then
-        python setup.py egg_info  # check egg_info while we're here
-        python setup.py sdist
+        python3 setup.py egg_info  # check egg_info while we're here
+        python3 setup.py sdist
         export ARCHIVE=$( ls dist/*.tar.gz )
       elif [ "$INSTALL_TYPE" == "wheel" ]; then
-        python setup.py bdist_wheel
+        python3 setup.py bdist_wheel
         export ARCHIVE=$( ls dist/*.whl )
       elif [ "$INSTALL_TYPE" == "archive" ]; then
         export ARCHIVE="package.tar.gz"
         git archive -o $ARCHIVE HEAD
       fi
-    - if [ -n "$DEPENDS" ]; then pip install $EXTRA_PIP_FLAGS $DEPENDS; fi
+    - if [ -n "$DEPENDS" ]; then python3 -m pip install $EXTRA_PIP_FLAGS $DEPENDS; fi
 
 # command to install dependencies
 install:
     - |
       if [ "$INSTALL_TYPE" == "setup" ]; then
-          python setup.py install
+          python3 setup.py install
       else
-          pip install $EXTRA_PIP_FLAGS $ARCHIVE
+          python3 -m pip install $EXTRA_PIP_FLAGS $ARCHIVE
       fi
     # Basic import check
-    - python -c 'import nibabel; print(nibabel.__version__)'
+    - python3 -c 'import nibabel; print(nibabel.__version__)'
     - if [ "$CHECK_TYPE" == "skiptests" ]; then exit 0; fi
 
 before_script:
     # Point to nibabel data directory
     - export NIBABEL_DATA_DIR="$PWD/nibabel-data"
     # Because nibabel is already installed, will just look up the extra
-    - pip install $EXTRA_PIP_FLAGS "nibabel[$CHECK_TYPE]"
+    - python3 -m pip install $EXTRA_PIP_FLAGS "nibabel[$CHECK_TYPE]"
 
 # command to run tests, e.g. python setup.py test
 script:
@@ -155,7 +168,7 @@ script:
       fi
 
 after_script:
-    - travis_retry pip install codecov
+    - travis_retry python3 -m pip install codecov
     - codecov
 
 notifications:

nibabel/minc2.py

@@ -27,8 +27,6 @@
 """
 import numpy as np
 
-from ._h5py_compat import h5py
-
 from .minc1 import Minc1File, MincHeader, Minc1Image, MincError
 
 
@@ -158,6 +156,9 @@ class Minc2Image(Minc1Image):
 
     @classmethod
     def from_file_map(klass, file_map, *, mmap=True, keep_file_open=None):
+        # Import of h5py might take awhile for MPI-enabled builds
+        # So we are importing it here "on demand"
+        from ._h5py_compat import h5py
         holder = file_map['image']
         if holder.filename is None:
             raise MincError('MINC2 needs filename for load')