MNT: Remove MincImage and MincFile, deprecated in 2.0 and expired in 3.0

Author: effigies

nibabel/__init__.py

@@ -55,7 +55,6 @@
 from .minc2 import Minc2Image
 from .cifti2 import Cifti2Header, Cifti2Image
 from .gifti import GiftiImage
-from .minc1 import MincImage
 from .freesurfer import MGHImage
 from .funcs import (squeeze_image, concat_images, four_to_three,
                     as_closest_canonical)

nibabel/minc1.py

@@ -17,8 +17,6 @@
 from .spatialimages import SpatialHeader, SpatialImage
 from .fileslice import canonical_slicers
 
-from .deprecated import deprecate_with_version
-
 _dt_dict = {
     ('b', 'unsigned'): np.uint8,
     ('b', 'signed__'): np.int8,
@@ -342,16 +340,3 @@ def from_file_map(klass, file_map, *, mmap=True, keep_file_open=None):
 
 
 load = Minc1Image.load
-
-
-# Backwards compatibility
-@deprecate_with_version('MincFile is deprecated; please use Minc1File instead',
-                        since='2.0.0', until='3.0.0', warn_class=FutureWarning)
-class MincFile(Minc1File):
-    pass
-
-
-@deprecate_with_version('MincImage is deprecated; please use Minc1Image instead',
-                        since='2.0.0', until='3.0.0', warn_class=FutureWarning)
-class MincImage(Minc1Image):
-    pass

nibabel/tests/test_minc1.py

@@ -100,23 +100,6 @@
 ]
 
 
-def test_old_namespace():
-    # Check old names are defined in minc1 module and top level
-    # Check warnings raised
-    arr = np.arange(24).reshape((2, 3, 4))
-    aff = np.diag([2, 3, 4, 1])
-
-    from .. import Minc1Image, MincImage
-    assert Minc1Image is not MincImage
-    with pytest.raises(ExpiredDeprecationError):
-        MincImage(arr, aff)
-    # Another old name
-    from ..minc1 import MincFile, Minc1File
-    assert MincFile is not Minc1File
-    with pytest.raises(ExpiredDeprecationError):
-        mf = MincFile(netcdf_file(EG_FNAME))
-
-
 class _TestMincFile(object):
     module = minc1
     file_class = Minc1File

nibabel/tests/test_removalschedule.py

@@ -14,6 +14,8 @@
 OBJECT_SCHEDULE = [
     ("5.0.0", [("nibabel.pydicom_compat", "dicom_test"),
                ("nibabel.onetime", "setattr_on_read")]),
+    ("4.0.0", [("nibabel.minc1", "MincFile"),
+               ("nibabel.minc1", "MincImage")]),
     ("3.0.0", [("nibabel.testing", "catch_warn_reset")]),
     # Verify that the test will be quiet if the schedule outlives the modules
     ("1.0.0", [("nibabel.nosuchmod", "anyobj"), ("nibabel.nifti1", "nosuchobj")]),