TEST: Expire some deprecation tests

Author: effigies

nibabel/tests/test_analyze.py

@@ -716,7 +716,7 @@ def test_default_header(self):
 
     def test_data_hdr_cache(self):
         # test the API for loaded images, such that the data returned
-        # from np.asanyarray(img.dataobj) and img,get_fdata() are not
+        # from np.asanyarray(img.dataobj) and img.get_fdata() are not
         # affected by subsequent changes to the header.
         IC = self.image_class
         # save an image to a file map
@@ -740,14 +740,6 @@ def test_data_hdr_cache(self):
         assert hdr.get_data_dtype() == np.dtype(np.uint8)
         assert_array_equal(img2.get_fdata(), data)
         assert_array_equal(np.asanyarray(img2.dataobj), data)
-        # now check read_img_data function - here we do see the changed
-        # header
-        with pytest.deprecated_call(match="from version: 3.2"):
-            sc_data = read_img_data(img2)
-        assert sc_data.shape == (3, 2, 2)
-        with pytest.deprecated_call(match="from version: 3.2"):
-            us_data = read_img_data(img2, prefer='unscaled')
-        assert us_data.shape == (3, 2, 2)
 
     def test_affine_44(self):
         IC = self.image_class

nibabel/tests/test_image_api.py

@@ -48,7 +48,7 @@
 
 from numpy.testing import assert_almost_equal, assert_array_equal, assert_warns, assert_allclose
 from nibabel.testing import (bytesio_round_trip, bytesio_filemap, assert_data_similar,
-                             clear_and_catch_warnings, nullcontext)
+                             clear_and_catch_warnings, nullcontext, expires)
 from ..tmpdirs import InTemporaryDirectory
 
 from .test_api_validators import ValidateAPI
@@ -170,8 +170,8 @@ def validate_no_slicing(self, imaker, params):
         with pytest.raises(TypeError):
             img[:]
 
+    @expires("5.0.0")
     def validate_get_data_deprecated(self, imaker, params):
-        # Check deprecated header API
         img = imaker()
         with pytest.deprecated_call():
             data = img.get_data()

nibabel/tests/test_image_load_save.py

@@ -29,6 +29,7 @@
 from ..volumeutils import native_code, swapped_code
 from ..optpkg import optional_package
 from ..spatialimages import SpatialImage
+from ..testing import expires
 
 from numpy.testing import assert_array_equal, assert_array_almost_equal
 import pytest
@@ -270,6 +271,7 @@ def test_filename_save():
             shutil.rmtree(pth)
 
 
+@expires('5.0.0')
 def test_guessed_image_type():
     # Test whether we can guess the image type from example files
     with pytest.deprecated_call():

nibabel/tests/test_loadsave.py

@@ -14,6 +14,7 @@
 from ..filebasedimages import ImageFileError
 from ..tmpdirs import InTemporaryDirectory, TemporaryDirectory
 from ..openers import Opener
+from ..testing import expires
 
 from ..optpkg import optional_package
 _, have_scipy, _ = optional_package('scipy')
@@ -27,6 +28,7 @@
 data_path = pjoin(dirname(__file__), 'data')
 
 
+@expires("5.0.0")
 def test_read_img_data():
     fnames_test = [
         'example4d.nii.gz',
@@ -120,6 +122,7 @@ def test_signature_matches_extension(tmp_path):
     assert msg == ""
 
 
+@expires("5.0.0")
 def test_read_img_data_nifti():
     shape = (2, 3, 4)
     data = np.random.normal(size=shape)

nibabel/tests/test_onetime.py

@@ -1,7 +1,9 @@
 import pytest
 from nibabel.onetime import auto_attr, setattr_on_read
+from nibabel.testing import expires
 
 
+@expires('5.0.0')
 def test_setattr_on_read():
     with pytest.deprecated_call():
         class MagicProp:

nibabel/tests/test_orientations.py

@@ -20,6 +20,7 @@
                             ornt2axcodes, axcodes2ornt, aff2axcodes)
 
 from ..affines import from_matvec, to_matvec
+from ..testing import expires
 
 
 IN_ARRS = [np.eye(4),
@@ -353,6 +354,7 @@ def test_inv_ornt_aff():
         inv_ornt_aff([[0, 1], [1, -1], [np.nan, np.nan]], (3, 4, 5))
 
 
+@expires('5.0.0')
 def test_flip_axis_deprecation():
     a = np.arange(24).reshape((2, 3, 4))
     axis = 1

nibabel/tests/test_spatialimages.py

@@ -26,7 +26,8 @@
     bytesio_round_trip,
     clear_and_catch_warnings,
     suppress_warnings,
-    memmap_after_ufunc
+    memmap_after_ufunc,
+    expires,
 )
 
 from ..tmpdirs import InTemporaryDirectory
@@ -358,6 +359,7 @@ def test_get_fdata(self):
         assert rt_img.get_fdata() is not out_data
         assert (rt_img.get_fdata() == in_data).all()
 
+    @expires("5.0.0")
     def test_get_data(self):
         # Test array image and proxy image interface
         img_klass = self.image_class