Jul 21, 2023 · Jul 20, 2023
diff --git a/testgres/utils.py b/testgres/utils.py
 import tempfile

 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:
 # 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
        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:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,7 +11,8 @@
		import tempfile

		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:
Expand All		@@ -27,8 +28,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():
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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:
Expand Down