Skip to content

Commit af3e7d8

Browse files
authored
Merge pull request #300 from rethinkdb/srh/py312
Update LooseVersion dependency
2 parents cab98de + 433dcf9 commit af3e7d8

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
async-generator==1.10; python_version>="3.6"
22
codacy-coverage==1.3.11
3+
looseversion==1.3.0
34
mock==3.0.5
45
pytest-cov==2.10.1
56
pytest-tornasync==0.6.0.post2; python_version >= '3.5'

rethinkdb/utils_common.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import collections
2121
import copy
22-
import distutils.version
22+
from looseversion import LooseVersion
2323
import getpass
2424
import inspect
2525
import optparse
@@ -146,7 +146,7 @@ def print_progress(ratio, indent=0, read=None, write=None):
146146

147147

148148
def check_minimum_version(options, minimum_version="1.6", raise_exception=True):
149-
minimum_version = distutils.version.LooseVersion(minimum_version)
149+
minimum_version = LooseVersion(minimum_version)
150150
version_string = options.retryQuery(
151151
"get server version",
152152
query.db("rethinkdb").table("server_status")[0]["process"]["version"],
@@ -159,7 +159,7 @@ def check_minimum_version(options, minimum_version="1.6", raise_exception=True):
159159
if not matches:
160160
raise RuntimeError("invalid version string format: %s" % version_string)
161161

162-
if distutils.version.LooseVersion(matches.group("version")) < minimum_version:
162+
if LooseVersion(matches.group("version")) < minimum_version:
163163
if raise_exception:
164164
raise RuntimeError(
165165
"Incompatible version, expected >= %s got: %s"

0 commit comments

Comments
 (0)