Add better semver support (#165)

ludeeus · May 27, 2022 · 8fb5c51 · 8fb5c51
1 parent 36458a3
commit 8fb5c51
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/awesomeversion/awesomeversion.py b/awesomeversion/awesomeversion.py
@@ -347,8 +347,7 @@ def modifier(self) -> str | None:
         ):
             match = self.strategy_description.pattern.match(self.string)
             if match and len(match.groups()) >= 4:
-                modifier_string = match.group(4)
-
+                self._modifier = modifier_string = match.group(4)
         else:
             modifier_string = self.string.split(".")[-1]
 

diff --git a/awesomeversion/comparehandlers/sections.py b/awesomeversion/comparehandlers/sections.py
@@ -3,7 +3,7 @@
 
 from typing import TYPE_CHECKING
 
-from ..utils.regex import RE_MODIFIER
+from ..utils.regex import RE_IS_SINGLE_DIGIT, RE_MODIFIER
 
 if TYPE_CHECKING:
     from ..awesomeversion import AwesomeVersion
@@ -64,4 +64,8 @@ def compare_modifier_section(
             if mod_a is not None and mod_b is not None:
                 return mod_a > mod_b
             return version_a_modifier.group(3) > version_a_modifier.group(3)
+        if RE_IS_SINGLE_DIGIT.match(version_a.modifier) and RE_IS_SINGLE_DIGIT.match(
+            version_b.modifier
+        ):
+            return int(version_a.modifier) > int(version_b.modifier)
     return None
diff --git a/awesomeversion/utils/regex.py b/awesomeversion/utils/regex.py
@@ -3,6 +3,7 @@
 from typing import Pattern
 
 # General purpose patterns
+RE_IS_SINGLE_DIGIT = re.compile(r"^\d{1}$")
 RE_DIGIT = re.compile(r"[a-z]*(\d+)[a-z]*")
 RE_MODIFIER = re.compile(r"^((?:\d+\-|\d|))(([a-z]+)\.?(\d*))$")
 

diff --git a/tests/test_compare.py b/tests/test_compare.py
@@ -41,6 +41,7 @@
         ("2021.2.0b0", "2021.1.0"),
         ("2021.2.0b10", "2021.1.0b2"),
         ("beta", "stable"),
+        ("1.2.3-2", "1.2.3-1"),
         ("dev", "latest"),
         ("latest", "2020.21.1"),
         ("latest", "beta"),