Skip to content

Commit 5f203ac

Browse files
committed
RF: rename ScalingMixin to ImageScalingMixin
We already had a HeaderScalingMixin.
1 parent 7472ebf commit 5f203ac

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

nibabel/tests/test_nifti1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ def test_float128(self):
627627
assert_raises(HeaderDataError, hdr.set_data_dtype, np.longdouble)
628628

629629

630-
class TestNifti1Pair(tana.TestAnalyzeImage, tspm.ScalingMixin):
630+
class TestNifti1Pair(tana.TestAnalyzeImage, tspm.ImageScalingMixin):
631631
# Run analyze-flavor spatialimage tests
632632
image_class = Nifti1Pair
633633
supported_np_types = TestNifti1PairHeader.supported_np_types

nibabel/tests/test_spm99analyze.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def test_origin_checks(self):
155155
'relative to dims')
156156

157157

158-
class ScalingMixin(object):
158+
class ImageScalingMixin(object):
159159
# Mixin to add scaling checks to image test class
160160
# Nifti tests inherits from Analyze tests not Spm Analyze tests. We need
161161
# these tests for Nifti scaling, hence the mixin.
@@ -385,7 +385,7 @@ def test_nan2zero_range_ok(self):
385385
assert_equal(rt_img.get_data()[0, 0, 0], 0)
386386

387387

388-
class TestSpm99AnalyzeImage(test_analyze.TestAnalyzeImage, ScalingMixin):
388+
class TestSpm99AnalyzeImage(test_analyze.TestAnalyzeImage, ImageScalingMixin):
389389
# class for testing images
390390
image_class = Spm99AnalyzeImage
391391
# Flag to skip bz2 save tests if they are going to break
@@ -408,15 +408,20 @@ class TestSpm99AnalyzeImage(test_analyze.TestAnalyzeImage, ScalingMixin):
408408
test_analyze.TestAnalyzeImage.test_big_offset_exts
409409
))
410410

411-
test_header_scaling = scipy_skip(ScalingMixin.test_header_scaling)
411+
test_header_scaling = scipy_skip(
412+
ImageScalingMixin.test_header_scaling)
412413

413-
test_int_int_scaling = scipy_skip(ScalingMixin.test_int_int_scaling)
414+
test_int_int_scaling = scipy_skip(
415+
ImageScalingMixin.test_int_int_scaling)
414416

415-
test_write_scaling = scipy_skip(ScalingMixin.test_write_scaling)
417+
test_write_scaling = scipy_skip(
418+
ImageScalingMixin.test_write_scaling)
416419

417-
test_no_scaling = scipy_skip(ScalingMixin.test_no_scaling)
420+
test_no_scaling = scipy_skip(
421+
ImageScalingMixin.test_no_scaling)
418422

419-
test_nan2zero_range_ok = scipy_skip(ScalingMixin.test_nan2zero_range_ok)
423+
test_nan2zero_range_ok = scipy_skip(
424+
ImageScalingMixin.test_nan2zero_range_ok)
420425

421426
@scipy_skip
422427
def test_mat_read(self):

0 commit comments

Comments
 (0)