Added has_feature_version

Author: radarhere

Tests/helper.py

@@ -175,6 +175,14 @@ def skip_unless_feature(feature: str) -> pytest.MarkDecorator:
     return pytest.mark.skipif(not features.check(feature), reason=reason)
 
 
+def has_feature_version(feature: str, required: str) -> bool:
+    version = features.version(feature)
+    assert version is not None
+    version_required = parse_version(required)
+    version_available = parse_version(version)
+    return version_available >= version_required
+
+
 def skip_unless_feature_version(
     feature: str, required: str, reason: str | None = None
 ) -> pytest.MarkDecorator:

Tests/test_file_webp_animated.py

@@ -4,13 +4,13 @@
 from pathlib import Path
 
 import pytest
-from packaging.version import parse as parse_version
 
-from PIL import GifImagePlugin, Image, WebPImagePlugin, features
+from PIL import GifImagePlugin, Image, WebPImagePlugin
 
 from .helper import (
     assert_image_equal,
     assert_image_similar,
+    has_feature_version,
     is_big_endian,
     skip_unless_feature,
 )
@@ -53,11 +53,8 @@ def test_write_animation_L(tmp_path: Path) -> None:
             im.load()
             assert_image_similar(im, orig.convert("RGBA"), 32.9)
 
-            if is_big_endian():
-                version = features.version_module("webp")
-                assert version is not None
-                if parse_version(version) < parse_version("1.2.2"):
-                    pytest.skip("Fails with libwebp earlier than 1.2.2")
+            if is_big_endian() and not has_feature_version("webp", "1.2.2"):
+                pytest.skip("Fails with libwebp earlier than 1.2.2")
             orig.seek(orig.n_frames - 1)
             im.seek(im.n_frames - 1)
             orig.load()
@@ -81,11 +78,8 @@ def check(temp_file: Path) -> None:
             assert_image_equal(im, frame1.convert("RGBA"))
 
             # Compare second frame to original
-            if is_big_endian():
-                version = features.version_module("webp")
-                assert version is not None
-                if parse_version(version) < parse_version("1.2.2"):
-                    pytest.skip("Fails with libwebp earlier than 1.2.2")
+            if is_big_endian() and not has_feature_version("webp", "1.2.2"):
+                pytest.skip("Fails with libwebp earlier than 1.2.2")
             im.seek(1)
             im.load()
             assert_image_equal(im, frame2.convert("RGBA"))

Tests/test_image_quantize.py

@@ -1,11 +1,16 @@
 from __future__ import annotations
 
 import pytest
-from packaging.version import parse as parse_version
 
-from PIL import Image, features
+from PIL import Image
 
-from .helper import assert_image_similar, hopper, is_ppc64le, skip_unless_feature
+from .helper import (
+    assert_image_similar,
+    has_feature_version,
+    hopper,
+    is_ppc64le,
+    skip_unless_feature,
+)
 
 
 def test_sanity() -> None:
@@ -23,11 +28,8 @@ def test_sanity() -> None:
 @skip_unless_feature("libimagequant")
 def test_libimagequant_quantize() -> None:
     image = hopper()
-    if is_ppc64le():
-        version = features.version_feature("libimagequant")
-        assert version is not None
-        if parse_version(version) < parse_version("4"):
-            pytest.skip("Fails with libimagequant earlier than 4.0.0 on ppc64le")
+    if is_ppc64le() and not has_feature_version("libimagequant", "4"):
+        pytest.skip("Fails with libimagequant earlier than 4.0.0 on ppc64le")
     converted = image.quantize(100, Image.Quantize.LIBIMAGEQUANT)
     assert converted.mode == "P"
     assert_image_similar(converted.convert("RGB"), image, 15)