Commit4e7f4b0

v.shepard

committed

merge master

2 parents12aa7ba +09e9f01 commit4e7f4b0Copy full SHA for 4e7f4b0

File tree

+21

-3

lines changed

+21

-3

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`importstat`
`5`	`5`	`importsubprocess`
`6`	`6`	`importtempfile`
`7`		`-fromshutilimportrmtree`
`8`	`7`
`9`	`8`	`importpsutil`
`10`	`9`
`@@ -14,8 +13,11 @@`
`14`	`13`
`15`	`14`	`try:`
`16`	`15`	`fromshutilimportwhichasfind_executable`
	`16`	`+fromshutilimportrmtree`
`17`	`17`	`exceptImportError:`
`18`	`18`	`fromdistutils.spawnimportfind_executable`
	`19`	`+fromdistutilsimportrmtree`
	`20`	`+`
`19`	`21`
`20`	`22`	`CMD_TIMEOUT_SEC=60`
`21`	`23`	`error_markers= [b'error',b'Permission denied',b'fatal']`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`	`importsys`
`9`	`9`
`10`	`10`	`fromcontextlibimportcontextmanager`
`11`		`-frompackaging.versionimportVersion`
	`11`	`+frompackaging.versionimportVersion,InvalidVersion`
	`12`	`+importre`
`12`	`13`
`13`	`14`	`fromsiximportiteritems`
`14`	`15`
`@@ -21,8 +22,15 @@`
`21`	`22`	`# ports used by nodes`
`22`	`23`	`bound_ports=set()`
`23`	`24`
	`25`	`+`
`24`	`26`	`# re-export version type`
`25`		`-PgVer=Version`
	`27`	`+classPgVer(Version):`
	`28`	`+def__init__(self,version:str)->None:`
	`29`	`+try:`
	`30`	`+super().__init__(version)`
	`31`	`+exceptInvalidVersion:`
	`32`	`+version=re.sub(r"[a-zA-Z].*","",version)`
	`33`	`+super().__init__(version)`
`26`	`34`
`27`	`35`
`28`	`36`	`defreserve_port():`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -901,13 +901,21 @@ def test_version_management(self):`
`901`	`901`	`d=PgVer('15.0')`
`902`	`902`	`e=PgVer('15rc1')`
`903`	`903`	`f=PgVer('15beta4')`
	`904`	`+h=PgVer('15.3biha')`
	`905`	`+i=PgVer('15.3')`
	`906`	`+g=PgVer('15.3.1bihabeta1')`
	`907`	`+k=PgVer('15.3.1')`
`904`	`908`
`905`	`909`	`self.assertTrue(a==b)`
`906`	`910`	`self.assertTrue(b>c)`
`907`	`911`	`self.assertTrue(a>c)`
`908`	`912`	`self.assertTrue(d>e)`
`909`	`913`	`self.assertTrue(e>f)`
`910`	`914`	`self.assertTrue(d>f)`
	`915`	`+self.assertTrue(h>f)`
	`916`	`+self.assertTrue(h==i)`
	`917`	`+self.assertTrue(g==k)`
	`918`	`+self.assertTrue(g>h)`
`911`	`919`
`912`	`920`	`version=get_pg_version()`
`913`	`921`	`withget_new_node()asnode:`

Comments

(0)