Fix compatibility with ImageMagick 7.1. (Closes: #330)

tests/comparators/test_ico_image.py

@@ -24,7 +24,7 @@ from diffoscope.config import Config
 from ..utils.data import load_fixture, get_data
 from ..utils.tools import (
     skip_unless_tools_exist,
-    skip_unless_tool_is_at_least,
+    skip_unless_tool_is_between,
 )
 from .test_jpeg_image import identify_version
 
@@ -61,14 +61,18 @@ def differences_meta(image1_meta, image2_meta):
 
 
 @skip_unless_tools_exist("img2txt", "identify")
-@skip_unless_tool_is_at_least("identify", identify_version, "6.9.10-23")
+@skip_unless_tool_is_between(
+    "identify", identify_version, "6.9.10-23", "7.0.0"
+)
 def test_diff_meta(differences_meta):
     expected_diff = get_data("ico_image_meta_expected_diff")
     assert differences_meta[-1].unified_diff == expected_diff
 
 
 @skip_unless_tools_exist("img2txt", "identify")
-@skip_unless_tool_is_at_least("identify", identify_version, "6.9.10-23")
+@skip_unless_tool_is_between(
+    "identify", identify_version, "6.9.10-23", "7.0.0"
+)
 def test_diff_meta2(differences_meta):
     expected_diff = get_data("ico_image_meta_expected_diff_v2")
     assert differences_meta[-1].unified_diff == expected_diff

tests/comparators/test_jpeg_image.py

@@ -24,7 +24,7 @@ from diffoscope.comparators.image import JPEGImageFile
 from diffoscope.comparators.missing_file import MissingFile
 
 from ..utils.data import load_fixture, get_data
-from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
+from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_between
 
 
 image1 = load_fixture("test1.jpg")
@@ -76,7 +76,7 @@ def differences_meta(image1_meta, image2_meta):
 
 
 @skip_unless_tools_exist("img2txt", "identify")
-@skip_unless_tool_is_at_least("identify", identify_version, "6.9.6")
+@skip_unless_tool_is_between("identify", identify_version, "6.9.6", "7.0.0")
 def test_diff_meta(differences_meta):
     expected_diff = get_data("jpeg_image_meta_expected_diff")
     assert differences_meta[-1].unified_diff == expected_diff