Support special version try #2

v.shepard · v.shepard · commit c16437b47d5b · 2023-07-20T01:36:50.000+02:00
diff --git a/testgres/utils.py b/testgres/utils.py
@@ -12,6 +12,7 @@
 
 from contextlib import contextmanager
 from packaging.version import Version
+import re
 
 try:
     from shutil import which as find_executable
@@ -31,9 +32,38 @@
 
 # re-export version type
 class PgVer(Version):
-    def __init__(self, version: str) -> None:
-        version = version.replace('biha', '')
-        super().__init__(version)
+    _VERSION_PATTERN = r"""
+        v?
+        (?:
+            (?:(?P<epoch>[0-9]+)!)?                           # epoch
+            (?P<release>[0-9]+(?:\.[0-9]+)*)                  # release segment
+            (?P<pre>                                          # pre-release
+                [-_\.]?
+                (?P<pre_l>(a|b|c|rc|alpha|beta|pre|preview|biha))
+                [-_\.]?
+                (?P<pre_n>[0-9]+)?
+            )?
+            (?P<post>                                         # post release
+                (?:-(?P<post_n1>[0-9]+))
+                |
+                (?:
+                    [-_\.]?
+                    (?P<post_l>post|rev|r)
+                    [-_\.]?
+                    (?P<post_n2>[0-9]+)?
+                )
+            )?
+            (?P<dev>                                          # dev release
+                [-_\.]?
+                (?P<dev_l>dev)
+                [-_\.]?
+                (?P<dev_n>[0-9]+)?
+            )?
+        )
+        (?:\+(?P<local>[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
+    """
+
+    _regex = re.compile(r"^\s*" + _VERSION_PATTERN + r"\s*$", re.VERBOSE | re.IGNORECASE)
 
 
 def reserve_port():
@@ -213,8 +243,6 @@ def get_pg_version():
                      .partition('devel')[0] \
                      .partition('beta')[0] \
                      .partition('rc')[0]
-    if 'biha' in version:
-        version = version.replace('biha', '')
     return version
 
 
diff --git a/tests/test_simple.py b/tests/test_simple.py
@@ -902,7 +902,7 @@ def test_version_management(self):
         e = PgVer('15rc1')
         f = PgVer('15beta4')
         g = PgVer('15.2beta4')
-        h = PgVer('15.2biha')
+        h = PgVer('15.2-biha')
 
         self.assertTrue(a == b)
         self.assertTrue(b > c)
