TEST: Fix imports, update uses of HAVE_INDEXED_GZIP, IndexedGzipFile

Author: pauldmccarthy

nibabel/benchmarks/bench_arrayproxy_slicing.py

@@ -18,7 +18,7 @@
 import numpy as np
 
 import nibabel as nib
-from nibabel.openers import HAVE_INDEXED_GZIP
+from nibabel._compression import HAVE_INDEXED_GZIP
 from nibabel.tmpdirs import InTemporaryDirectory
 
 from ..rstutils import rst_table
@@ -135,14 +135,14 @@ def fmt_sliceobj(sliceobj):
             # load uncompressed and compressed versions of the image
             img = nib.load(testfile, keep_file_open=keep_open)
 
-            with mock.patch('nibabel.openers.HAVE_INDEXED_GZIP', have_igzip):
+            with mock.patch('nibabel._compression.HAVE_INDEXED_GZIP', have_igzip):
                 imggz = nib.load(testfilegz, keep_file_open=keep_open)
 
             def basefunc():
                 img.dataobj[fix_sliceobj(sliceobj)]
 
             def testfunc():
-                with mock.patch('nibabel.openers.HAVE_INDEXED_GZIP', have_igzip):
+                with mock.patch('nibabel._compression.HAVE_INDEXED_GZIP', have_igzip):
                     imggz.dataobj[fix_sliceobj(sliceobj)]
 
             # make sure nothing is floating around from the previous test

nibabel/benchmarks/bench_fileslice.py

@@ -14,12 +14,11 @@
 
 import numpy as np
 
+from .._compression import HAVE_ZSTD
 from ..fileslice import fileslice
 from ..openers import ImageOpener
-from ..optpkg import optional_package
 from ..rstutils import rst_table
 from ..tmpdirs import InTemporaryDirectory
-from .._compression import HAVE_ZSTD
 
 SHAPE = (64, 64, 32, 100)
 ROW_NAMES = [f'axis {i}, len {dim}' for i, dim in enumerate(SHAPE)]

nibabel/tests/test_analyze.py

@@ -24,11 +24,11 @@
 from numpy.testing import assert_array_almost_equal, assert_array_equal
 
 from .. import imageglobals
+from .._compression import HAVE_ZSTD
 from ..analyze import AnalyzeHeader, AnalyzeImage
 from ..arraywriters import WriterError
 from ..casting import sctypes_aliases
 from ..nifti1 import Nifti1Header
-from ..optpkg import optional_package
 from ..spatialimages import HeaderDataError, HeaderTypeError, supported_np_types
 from ..testing import (
     assert_dt_equal,
@@ -38,7 +38,6 @@
     suppress_warnings,
 )
 from ..tmpdirs import InTemporaryDirectory
-from .._compression import HAVE_ZSTD
 from . import test_spatialimages as tsi
 from . import test_wrapstruct as tws
 

nibabel/tests/test_loadsave.py

@@ -16,13 +16,13 @@
     Spm2AnalyzeImage,
     Spm99AnalyzeImage,
 )
+from .._compression import HAVE_ZSTD
 from ..filebasedimages import ImageFileError
 from ..loadsave import _signature_matches_extension, load, read_img_data
 from ..openers import Opener
 from ..optpkg import optional_package
 from ..testing import deprecated_to, expires
 from ..tmpdirs import InTemporaryDirectory
-from .._compression import HAVE_ZSTD
 
 _, have_scipy, _ = optional_package('scipy')
 

nibabel/tests/test_minc1.py

@@ -17,14 +17,13 @@
 from numpy.testing import assert_array_equal
 
 from .. import Nifti1Image, load, minc1
+from .._compression import HAVE_ZSTD, zstd
 from ..externals.netcdf import netcdf_file
 from ..minc1 import Minc1File, Minc1Image, MincHeader
-from ..optpkg import optional_package
 from ..testing import assert_data_similar, data_path
 from ..tmpdirs import InTemporaryDirectory
 from . import test_spatialimages as tsi
 from .test_fileslice import slicer_samples
-from .._compression import zstd, HAVE_ZSTD
 
 EG_FNAME = pjoin(data_path, 'tiny.mnc')
 

nibabel/tests/test_openers.py

@@ -20,10 +20,9 @@
 import pytest
 from packaging.version import Version
 
-from ..openers import HAVE_INDEXED_GZIP, BZ2File, DeterministicGzipFile, ImageOpener, Opener
-from ..optpkg import optional_package
+from .._compression import HAVE_INDEXED_GZIP, HAVE_ZSTD, DeterministicGzipFile, zstd
+from ..openers import BZ2File, ImageOpener, Opener
 from ..tmpdirs import InTemporaryDirectory
-from .._compression import zstd, HAVE_ZSTD
 
 
 class Lunk:
@@ -122,8 +121,6 @@ def patch_indexed_gzip(state):
         values = (False, GzipFile)
     with (
         mock.patch('nibabel._compression.HAVE_INDEXED_GZIP', values[0]),
-        mock.patch('nibabel.openers.HAVE_INDEXED_GZIP', values[0]),
-        mock.patch('nibabel.openers.IndexedGzipFile', values[1], create=True),
         mock.patch('nibabel._compression.IndexedGzipFile', values[1], create=True),
     ):
         yield
@@ -267,7 +264,7 @@ class StrictOpener(Opener):
                 assert isinstance(fobj.fobj, file_class)
             elif lext == 'gz':
                 try:
-                    from ..openers import IndexedGzipFile
+                    from .._compression import IndexedGzipFile
                 except ImportError:
                     IndexedGzipFile = GzipFile
                 assert isinstance(fobj.fobj, (GzipFile, IndexedGzipFile))

nibabel/tests/test_volumeutils.py

@@ -32,9 +32,9 @@
     suppress_warnings,
 )
 
+from .._compression import HAVE_ZSTD, zstd
 from ..casting import OK_FLOATS, floor_log2, sctypes, shared_range, type_info
 from ..openers import BZ2File, ImageOpener, Opener
-from ..optpkg import optional_package
 from ..tmpdirs import InTemporaryDirectory
 from ..volumeutils import (
     _dt_min_max,
@@ -56,7 +56,6 @@
     working_type,
     write_zeros,
 )
-from .._compression import zstd, HAVE_ZSTD
 
 # convenience variables for numpy types
 FLOAT_TYPES = sctypes['float']