Temporary fix for semver-unstable sort

    - Revert this once this is fixed in upstream
    - rbarrois/python-semanticversion#132

Signed-off-by: Keshav Priyadarshi <[email protected]>

src/univers/utils.py

@@ -4,6 +4,8 @@
 #
 # Visit https://aboutcode.org and https://github.com/nexB/univers for support and download.
 
+import semantic_version
+
 
 def remove_spaces(string):
     return "".join(string.split())
@@ -27,3 +29,15 @@ def cmp(x, y):
     else:
         # note that this is the minimal replacement function
         return (x > y) - (x < y)
+
+
+class SortableSemverVersion(semantic_version.Version):
+    """
+    TODO: This is temporary workaround for unstable sort
+    Revert this and associated changes once the upstream is fixed.
+    https://github.com/rbarrois/python-semanticversion/issues/132
+    """
+
+    @property
+    def precedence_key(self):
+        return super().precedence_key + (self.build,)

src/univers/versions.py

@@ -8,7 +8,7 @@
 import functools
 
 import attr
-import semantic_version
+from univers.utils import SortableSemverVersion
 from packaging import version as packaging_version
 
 from univers import arch
@@ -209,7 +209,7 @@ class SemverVersion(Version):
 
     @classmethod
     def build_value(cls, string):
-        return semantic_version.Version.coerce(string)
+        return SortableSemverVersion.coerce(string)
 
     @classmethod
     def is_valid(cls, string):
@@ -431,14 +431,14 @@ def __gt__(self, other):
 class ComposerVersion(SemverVersion):
     @classmethod
     def build_value(cls, string):
-        return semantic_version.Version.coerce(string.lstrip("vV"))
+        return SortableSemverVersion.coerce(string.lstrip("vV"))
 
 
 @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"))
+        return SortableSemverVersion.coerce(string.lstrip("vV"))
 
 
 @attr.s(frozen=True, order=False, eq=False, hash=True)
@@ -605,7 +605,7 @@ def is_valid_new(cls, string):
         True
         """
         if SemverVersion.is_valid(string):
-            sem = semantic_version.Version.coerce(string)
+            sem = SortableSemverVersion.coerce(string)
             return sem.major >= 3
 
     @classmethod