merge master

v.shepard · v.shepard · commit 233893173c0a · 2023-08-04T14:11:04.000+02:00
diff --git a/testgres/utils.py b/testgres/utils.py
@@ -8,8 +8,12 @@
 import sys
 
 from contextlib import contextmanager
-from packaging.version import Version
-
+from packaging.version import Version, InvalidVersion
+import re
+try:
+    from shutil import which as find_executable
+except ImportError:
+    from distutils.spawn import find_executable
 from six import iteritems
 
 from .exceptions import ExecUtilException
@@ -21,8 +25,15 @@
 # ports used by nodes
 bound_ports = set()
 
+
 # re-export version type
-PgVer = Version
+class PgVer(Version):
+    def __init__(self, version: str) -> None:
+        try:
+            super().__init__(version)
+        except InvalidVersion:
+            version = re.sub(r"[a-zA-Z].*", "", version)
+            super().__init__(version)
 
 
 def reserve_port():
diff --git a/tests/test_simple.py b/tests/test_simple.py
@@ -901,13 +901,21 @@ def test_version_management(self):
         d = PgVer('15.0')
         e = PgVer('15rc1')
         f = PgVer('15beta4')
+        h = PgVer('15.3biha')
+        i = PgVer('15.3')
+        g = PgVer('15.3.1bihabeta1')
+        k = PgVer('15.3.1')
 
         self.assertTrue(a == b)
         self.assertTrue(b > c)
         self.assertTrue(a > c)
         self.assertTrue(d > e)
         self.assertTrue(e > f)
         self.assertTrue(d > f)
+        self.assertTrue(h > f)
+        self.assertTrue(h == i)
+        self.assertTrue(g == k)
+        self.assertTrue(g > h)
 
         version = get_pg_version()
         with get_new_node() as node:
