Fix comparison in version subclasses

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

src/univers/versions.py

@@ -172,6 +172,16 @@ def is_valid(cls, string):
         #   10.2alpha3..patch.4. → 10, 2, alpha, 3, patch, 4
         return super(GenericVersion, cls).is_valid(string)
 
+    def __lt__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value < other.value
+
+    def __eq__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value == other.value
+
 
 @attr.s(frozen=True, order=False, eq=False, hash=True)
 class PypiVersion(Version):
@@ -198,7 +208,15 @@ def is_valid(cls, string):
         except packaging_version.InvalidVersion:
             return False
 
-        return False
+    def __lt__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value < other.value
+
+    def __eq__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value == other.value
 
 
 @attr.s(frozen=True, order=False, eq=False, hash=True)
@@ -248,6 +266,16 @@ def next_minor(self):
     def next_patch(self):
         return self.value and self.value.next_patch()
 
+    def __lt__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value < other.value
+
+    def __eq__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value == other.value
+
 
 def is_even(s):
     """
@@ -264,7 +292,7 @@ def is_even(s):
     return (int(s) % 2) == 0
 
 
-@attr.s(frozen=True, order=False, eq=False, hash=True)
+# @attr.s(frozen=True, order=False, eq=False, hash=True)
 class NginxVersion(SemverVersion):
     """
     Semver with 3 segments and extra attribute for stable vs. unstable branches
@@ -294,6 +322,16 @@ def build_value(cls, string):
     def is_valid(cls, string):
         return gem.GemVersion.is_correct(string)
 
+    def __lt__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value < other.value
+
+    def __eq__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value == other.value
+
 
 @attr.s(frozen=True, order=False, eq=False, hash=True)
 class ArchLinuxVersion(Version):
@@ -333,6 +371,16 @@ def build_value(cls, string):
     def is_valid(cls, string):
         return debian.Version.is_valid(string)
 
+    def __lt__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value < other.value
+
+    def __eq__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value == other.value
+
 
 @attr.s(frozen=True, order=False, eq=False, hash=True)
 class MavenVersion(Version):
@@ -343,6 +391,16 @@ class MavenVersion(Version):
     def build_value(cls, string):
         return maven.Version(string)
 
+    def __lt__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value < other.value
+
+    def __eq__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value == other.value
+
 
 # We will use total ordering to sort the versions, since these versions also consider prereleases.
 @attr.s(frozen=True, order=False, eq=False, hash=True)
@@ -386,6 +444,16 @@ class RpmVersion(Version):
     def build_value(cls, string):
         return rpm.RpmVersion.from_string(string)
 
+    def __lt__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value < other.value
+
+    def __eq__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value == other.value
+
 
 @total_ordering
 @attr.s(frozen=True, order=False, eq=False, hash=True)
@@ -433,13 +501,33 @@ class ComposerVersion(SemverVersion):
     def build_value(cls, string):
         return semantic_version.Version.coerce(string.lstrip("vV"))
 
+    def __lt__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value < other.value
+
+    def __eq__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value == other.value
+
 
 @attr.s(frozen=True, order=False, eq=False, hash=True)
 class GolangVersion(SemverVersion):
     @classmethod
     def build_value(cls, string):
         return semantic_version.Version.coerce(string.lstrip("vV"))
 
+    def __lt__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value < other.value
+
+    def __eq__(self, other):
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value == other.value
+
 
 @attr.s(frozen=True, order=False, eq=False, hash=True)
 class LegacyOpensslVersion(Version):

tests/test_pypi_version.py

@@ -8,14 +8,25 @@
 
 from packaging import version as packaging_version
 
-from univers import versions
+from univers.versions import InvalidVersion
+from univers.versions import PypiVersion
 
 # version comparison is already tested at:
 # https://github.com/pypa/packaging/blob/main/tests/test_version.py
 
 
 class TestPYPIVersion(TestCase):
     def test_constructor(self):
-        pypi_version = versions.PypiVersion("2.4.5")
+        pypi_version = PypiVersion("2.4.5")
         assert pypi_version.value == packaging_version.Version("2.4.5")
-        self.assertRaises(versions.InvalidVersion, versions.PypiVersion, "2.//////")
+        self.assertRaises(InvalidVersion, PypiVersion, "2.//////")
+
+    def test_compare(self):
+        pypi_version = PypiVersion("2.4.5")
+        assert pypi_version == PypiVersion("2.4.5")
+        assert pypi_version != PypiVersion("2.4.6")
+        assert pypi_version > PypiVersion("2.4.4")
+        assert pypi_version >= PypiVersion("2.4.4")
+        assert pypi_version < PypiVersion("2.4.6")
+        assert pypi_version <= PypiVersion("2.4.6")
+        assert PypiVersion("2.4") == PypiVersion("2.4.0")