MNT: Drop _h5py_compat hack (no effect post-3.6)

Author: effigies

nibabel/_h5py_compat.py

@@ -158,7 +158,7 @@ class Minc2Image(Minc1Image):
     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
+        import h5py
         holder = file_map['image']
         if holder.filename is None:
             raise MincError('MINC2 needs filename for load')

nibabel/minc2.py

@@ -32,7 +32,7 @@
 
 from ..optpkg import optional_package
 _, have_scipy, _ = optional_package('scipy')
-from .._h5py_compat import have_h5py
+_, have_h5py, _ = optional_package('h5py')
 
 from .. import (AnalyzeImage, Spm99AnalyzeImage, Spm2AnalyzeImage,
                 Nifti1Pair, Nifti1Image, Nifti2Pair, Nifti2Image,

nibabel/tests/test_h5py_compat.py

@@ -10,15 +10,16 @@
 from nibabel.analyze import AnalyzeImage
 from nibabel.nifti1 import Nifti1Image
 from nibabel.nifti2 import Nifti2Image
-from .._h5py_compat import have_h5py
 
 from nibabel import imageclasses
 from nibabel.imageclasses import spatial_axes_first, class_map, ext_map
 
-
+from nibabel.optpkg import optional_package
 from nibabel.testing import clear_and_catch_warnings
 
 
+have_h5py = optional_package('h5py')[1]
+
 DATA_DIR = pjoin(dirname(__file__), 'data')
 
 MINC_3DS = ('minc1_1_scale.mnc',)

nibabel/tests/test_image_api.py

@@ -13,12 +13,14 @@
 
 from .. import minc2
 from ..minc2 import Minc2File, Minc2Image
-from .._h5py_compat import h5py, have_h5py, setup_module
 
+from ..optpkg import optional_package
 from ..testing import data_path
 
 from . import test_minc1 as tm2
 
+h5py, have_h5py, setup_module = optional_package('h5py')
+
 # Example images in format expected for ``test_image_api``, adding ``zooms``
 # item.
 EXAMPLE_IMAGES = [

nibabel/tests/test_imageclasses.py

@@ -14,13 +14,14 @@
 
 import numpy as np
 
-from .._h5py_compat import h5py, have_h5py, setup_module
-
 from .nibabel_data import get_nibabel_data, needs_nibabel_data
 from .. import load as top_load, Nifti1Image
+from ..optpkg import optional_package
 
 from numpy.testing import (assert_array_equal, assert_almost_equal)
 
+h5py, have_h5py, setup_module = optional_package('h5py')
+
 MINC2_PATH = pjoin(get_nibabel_data(), 'nitest-minc2')
 
 

nibabel/tests/test_minc2.py

@@ -44,7 +44,6 @@
 from .. import minc1
 from ..externals.netcdf import netcdf_file
 from .. import minc2
-from .._h5py_compat import h5py, have_h5py
 from .. import ecat
 from .. import parrec
 from ..casting import have_binary128
@@ -57,12 +56,15 @@
 
 from ..testing import data_path as DATA_PATH, assert_dt_equal, clear_and_catch_warnings
 from ..deprecator import ExpiredDeprecationError
+from ..optpkg import optional_package
 
 from ..tmpdirs import InTemporaryDirectory
 
 from .test_api_validators import ValidateAPI
 from .test_parrec import EG_REC, VARY_REC
 
+h5py, have_h5py, _ = optional_package('h5py')
+
 
 def _some_slicers(shape):
     ndim = len(shape)