deps: use `packaging` instead of deprecated `distutils` (#2931)

Replace `distutils.Version` (deprecated) with `packaging.Version`

Signed-off-by: Francesco Casalegno <francesco.casalegno@gmail.com>
This commit is contained in:
Francesco Casalegno 2022-07-26 21:45:51 +02:00 committed by GitHub
parent 4e19cc48df
commit 2e6dad7983
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions

View File

@ -4,7 +4,7 @@
"""
import sys
from distutils.version import StrictVersion
from packaging.version import Version
from requests.adapters import HTTPAdapter
from docker.transport.basehttpadapter import BaseHTTPAdapter
@ -70,4 +70,4 @@ class SSLHTTPAdapter(BaseHTTPAdapter):
return False
if urllib_ver == 'dev':
return True
return StrictVersion(urllib_ver) > StrictVersion('1.5')
return Version(urllib_ver) > Version('1.5')

View File

@ -6,7 +6,7 @@ import os.path
import shlex
import string
from datetime import datetime
from distutils.version import StrictVersion
from packaging.version import Version
from .. import errors
from ..constants import DEFAULT_HTTP_HOST
@ -55,8 +55,8 @@ def compare_version(v1, v2):
>>> compare_version(v2, v2)
0
"""
s1 = StrictVersion(v1)
s2 = StrictVersion(v2)
s1 = Version(v1)
s2 = Version(v2)
if s1 == s2:
return 0
elif s1 > s2:

View File

@ -6,7 +6,7 @@ cryptography==3.4.7
enum34==1.1.6
idna==2.5
ipaddress==1.0.18
packaging==16.8
packaging==21.3
paramiko==2.10.1
pycparser==2.17
pyOpenSSL==18.0.0

View File

@ -10,6 +10,7 @@ ROOT_DIR = os.path.dirname(__file__)
SOURCE_DIR = os.path.join(ROOT_DIR)
requirements = [
'packaging',
'websocket-client >= 0.32.0',
'requests >= 2.14.2, != 2.18.0',
]