Allow comparing GenericVersion() against int and str values

diff --git a/mkosi/versioncomp.py b/mkosi/versioncomp.py
index da87bd30a3615e829677765d0368fcd5d1eb2eb8..9025a5a7adcb056f06c14005a0f8a17e7df0e1e0 100644 (file)
--- a/mkosi/versioncomp.py
+++ b/mkosi/versioncomp.py
@@ -139,32 +139,44 @@ class GenericVersion:
             v2 = v2.removeprefix(v2_letter_prefix)
 
     def __eq__(self, other: object) -> bool:
-        if not isinstance(other, GenericVersion):
+        if isinstance(other, (str, int)):
+            other = GenericVersion(str(other))
+        elif not isinstance(other, GenericVersion):
             return False
         return self.compare_versions(self._version, other._version) == self._EQUAL
 
     def __ne__(self, other: object) -> bool:
-        if not isinstance(other, GenericVersion):
+        if isinstance(other, (str, int)):
+            other = GenericVersion(str(other))
+        elif not isinstance(other, GenericVersion):
             return False
         return self.compare_versions(self._version, other._version) != self._EQUAL
 
     def __lt__(self, other: object) -> bool:
-        if not isinstance(other, GenericVersion):
+        if isinstance(other, (str, int)):
+            other = GenericVersion(str(other))
+        elif not isinstance(other, GenericVersion):
             return False
         return self.compare_versions(self._version, other._version) == self._LEFT_SMALLER
 
     def __le__(self, other: object) -> bool:
-        if not isinstance(other, GenericVersion):
+        if isinstance(other, (str, int)):
+            other = GenericVersion(str(other))
+        elif not isinstance(other, GenericVersion):
             return False
         return self.compare_versions(self._version, other._version) in (self._EQUAL, self._LEFT_SMALLER)
 
     def __gt__(self, other: object) -> bool:
-        if not isinstance(other, GenericVersion):
+        if isinstance(other, (str, int)):
+            other = GenericVersion(str(other))
+        elif not isinstance(other, GenericVersion):
             return False
         return self.compare_versions(self._version, other._version) == self._RIGHT_SMALLER
 
     def __ge__(self, other: object) -> bool:
-        if not isinstance(other, GenericVersion):
+        if isinstance(other, (str, int)):
+            other = GenericVersion(str(other))
+        elif not isinstance(other, GenericVersion):
             return False
         return self.compare_versions(self._version, other._version) in (self._EQUAL, self._RIGHT_SMALLER)
 

diff --git a/tests/test_versioncomp.py b/tests/test_versioncomp.py
index 98ec9d2849c64cf2e539305e006e56bda6ec5708..265e60ce9a4ecfd6417d80abaf25f7a5f87e667e 100644 (file)
--- a/tests/test_versioncomp.py
+++ b/tests/test_versioncomp.py
@@ -6,6 +6,14 @@ import pytest
 from mkosi.versioncomp import GenericVersion
 
 
+def test_conversion() -> None:
+    assert GenericVersion("1") < 2
+    assert GenericVersion("1") < "2"
+    assert GenericVersion("2") > 1
+    assert GenericVersion("2") > "1"
+    assert GenericVersion("1") == "1"
+
+
 def test_generic_version_systemd() -> None:
     """Same as the first block of systemd/test/test-compare-versions.sh"""
     assert GenericVersion("1") < GenericVersion("2")