File tree Expand file tree Collapse file tree 2 files changed +14
-2
lines changed Expand file tree Collapse file tree 2 files changed +14
-2
lines changed Original file line number Diff line number Diff line change 1111import tempfile
1212
1313from contextlib import contextmanager
14- from packaging .version import Version
14+ from packaging .version import Version , InvalidVersion
15+ import re
1516try :
1617 from shutil import which as find_executable
1718except ImportError :
2728# ports used by nodes
2829bound_ports = set ()
2930
31+
3032# re-export version type
31- PgVer = Version
33+ class PgVer (Version ):
34+ def __init__ (self , version : str ) -> None :
35+ try :
36+ super ().__init__ (version )
37+ except InvalidVersion :
38+ version = re .sub (r"[a-zA-Z]+" , "" , version )
39+ super ().__init__ (version )
3240
3341
3442def reserve_port ():
Original file line number Diff line number Diff line change @@ -901,13 +901,17 @@ def test_version_management(self):
901901 d = PgVer ('15.0' )
902902 e = PgVer ('15rc1' )
903903 f = PgVer ('15beta4' )
904+ h = PgVer ('15.3biha' )
905+ i = PgVer ('15.3' )
904906
905907 self .assertTrue (a == b )
906908 self .assertTrue (b > c )
907909 self .assertTrue (a > c )
908910 self .assertTrue (d > e )
909911 self .assertTrue (e > f )
910912 self .assertTrue (d > f )
913+ self .assertTrue (h > f )
914+ self .assertTrue (h == i )
911915
912916 version = get_pg_version ()
913917 with get_new_node () as node :
You can’t perform that action at this time.
0 commit comments