TEST: Import have_h5py and similar from nibabel.minc2

Author: effigies

nibabel/tests/test_image_api.py

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

nibabel/tests/test_imageclasses.py

@@ -6,12 +6,11 @@
 
 import numpy as np
 
-from nibabel.optpkg import optional_package
-
 import nibabel as nib
 from nibabel.analyze import AnalyzeImage
 from nibabel.nifti1 import Nifti1Image
 from nibabel.nifti2 import Nifti2Image
+from ..minc2 import have_h5py
 
 from nibabel import imageclasses
 from nibabel.imageclasses import spatial_axes_first, class_map, ext_map
@@ -23,8 +22,6 @@
 
 DATA_DIR = pjoin(dirname(__file__), 'data')
 
-have_h5py = optional_package('h5py')[1]
-
 MINC_3DS = ('minc1_1_scale.mnc',)
 MINC_4DS = ('minc1_4d.mnc',)
 if have_h5py:

nibabel/tests/test_minc2.py

@@ -12,12 +12,8 @@
 
 import numpy as np
 
-from ..optpkg import optional_package
-
-h5py, have_h5py, setup_module = optional_package('h5py')
-
 from .. import minc2
-from ..minc2 import Minc2File, Minc2Image
+from ..minc2 import Minc2File, Minc2Image, h5py, have_h5py, setup_module
 
 from nose.tools import (assert_true, assert_equal, assert_false, assert_raises)
 

nibabel/tests/test_minc2_data.py

@@ -15,9 +15,7 @@
 
 import numpy as np
 
-from nibabel.optpkg import optional_package
-
-h5py, have_h5py, setup_module = optional_package('h5py')
+from ..minc2 import h5py, have_h5py, setup_module
 
 from .nibabel_data import get_nibabel_data, needs_nibabel_data
 from .. import load as top_load, Nifti1Image

nibabel/tests/test_proxy_api.py

@@ -46,8 +46,7 @@
 from .. import minc1
 from ..externals.netcdf import netcdf_file
 from .. import minc2
-from ..optpkg import optional_package
-h5py, have_h5py, _ = optional_package('h5py')
+from ..minc2 import h5py, have_h5py
 from .. import ecat
 from .. import parrec