Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8ed5e5f

Browse files
authored
[PBCKP-289] fix distutils deprecation warnings
Warning was:"DeprecationWarning: distutils Version classes are deprecated. Use packaging.version instead."
2 parentsb293074 +e73c3b9 commit8ed5e5f

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

‎testgres/node.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ def _create_recovery_conf(self, username, slot=None):
339339
"primary_conninfo='{}'\n"
340340
).format(options_string(**conninfo))# yapf: disable
341341
# Since 12 recovery.conf had disappeared
342-
ifself.version>='12':
342+
ifself.version>=PgVer('12'):
343343
signal_name=os.path.join(self.data_dir,"standby.signal")
344344
# cross-python touch(). It is vulnerable to races, but who cares?
345345
withopen(signal_name,'a'):
@@ -371,7 +371,7 @@ def _create_recovery_conf(self, username, slot=None):
371371

372372
line+="primary_slot_name={}\n".format(slot)
373373

374-
ifself.version>='12':
374+
ifself.version>=PgVer('12'):
375375
self.append_conf(line=line)
376376
else:
377377
self.append_conf(filename=RECOVERY_CONF_FILE,line=line)
@@ -517,9 +517,9 @@ def get_auth_method(t):
517517
# binary replication
518518
ifallow_streaming:
519519
# select a proper wal_level for PostgreSQL
520-
wal_level='replica'ifself._pg_version>='9.6'else'hot_standby'
520+
wal_level='replica'ifself._pg_version>=PgVer('9.6')else'hot_standby'
521521

522-
ifself._pg_version<'13':
522+
ifself._pg_version<PgVer('13'):
523523
self.append_conf(hot_standby=True,
524524
wal_keep_segments=WAL_KEEP_SEGMENTS,
525525
wal_level=wal_level)# yapf: disable
@@ -530,7 +530,7 @@ def get_auth_method(t):
530530

531531
# logical replication
532532
ifallow_logical:
533-
ifself._pg_version<'10':
533+
ifself._pg_version<PgVer('10'):
534534
raiseInitNodeException("Logical replication is only "
535535
"available on PostgreSQL 10 and newer")
536536

@@ -616,7 +616,7 @@ def get_control_data(self):
616616

617617
# this one is tricky (blame PG 9.4)
618618
_params= [get_bin_path("pg_controldata")]
619-
_params+= ["-D"]ifself._pg_version>='9.5'else []
619+
_params+= ["-D"]ifself._pg_version>=PgVer('9.5')else []
620620
_params+= [self.data_dir]
621621

622622
data=execute_utility(_params,self.utils_log_file)
@@ -758,7 +758,7 @@ def promote(self, dbname=None, username=None):
758758

759759
# for versions below 10 `promote` is asynchronous so we need to wait
760760
# until it actually becomes writable
761-
ifself._pg_version<'10':
761+
ifself._pg_version<PgVer('10'):
762762
check_query="SELECT pg_is_in_recovery()"
763763

764764
self.poll_query_until(query=check_query,
@@ -1158,7 +1158,7 @@ def set_synchronous_standbys(self, standbys):
11581158
master.restart()
11591159
11601160
"""
1161-
ifself._pg_version>='9.6':
1161+
ifself._pg_version>=PgVer('9.6'):
11621162
ifisinstance(standbys,Iterable):
11631163
standbys=First(1,standbys)
11641164
else:
@@ -1179,7 +1179,7 @@ def catchup(self, dbname=None, username=None):
11791179
ifnotself.master:
11801180
raiseTestgresException("Node doesn't have a master")
11811181

1182-
ifself._pg_version>='10':
1182+
ifself._pg_version>=PgVer('10'):
11831183
poll_lsn="select pg_catalog.pg_current_wal_lsn()::text"
11841184
wait_lsn="select pg_catalog.pg_last_wal_replay_lsn() >= '{}'::pg_lsn"
11851185
else:

‎testgres/utils.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
importtempfile
1212

1313
fromcontextlibimportcontextmanager
14-
fromdistutils.versionimportLooseVersion
14+
frompackaging.versionimportVersion
1515
fromdistutils.spawnimportfind_executable
1616
fromsiximportiteritems
1717

@@ -25,7 +25,7 @@
2525
bound_ports=set()
2626

2727
# re-export version type
28-
PgVer=LooseVersion
28+
PgVer=Version
2929

3030

3131
defreserve_port():

‎tests/test_simple.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -896,16 +896,22 @@ def test_version_management(self):
896896
a=PgVer('10.0')
897897
b=PgVer('10')
898898
c=PgVer('9.6.5')
899+
d=PgVer('15.0')
900+
e=PgVer('15rc1')
901+
f=PgVer('15beta4')
899902

900-
self.assertTrue(a>b)
903+
self.assertTrue(a==b)
901904
self.assertTrue(b>c)
902905
self.assertTrue(a>c)
906+
self.assertTrue(d>e)
907+
self.assertTrue(e>f)
908+
self.assertTrue(d>f)
903909

904910
version=get_pg_version()
905911
withget_new_node()asnode:
906912
self.assertTrue(isinstance(version,six.string_types))
907913
self.assertTrue(isinstance(node.version,PgVer))
908-
self.assertEqual(node.version,str(version))
914+
self.assertEqual(node.version,PgVer(version))
909915

910916
deftest_child_pids(self):
911917
master_processes= [

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp