Fixing deprecating distutils (PEP 632) (#1730)

Author: chayim

redis/connection.py

@@ -1,4 +1,4 @@
-from distutils.version import LooseVersion
+from packaging.version import Version
 from itertools import chain
 from time import time
 from queue import LifoQueue, Empty, Full
@@ -55,13 +55,13 @@
 if HIREDIS_AVAILABLE:
     import hiredis
 
-    hiredis_version = LooseVersion(hiredis.__version__)
+    hiredis_version = Version(hiredis.__version__)
     HIREDIS_SUPPORTS_CALLABLE_ERRORS = \
-        hiredis_version >= LooseVersion('0.1.3')
+        hiredis_version >= Version('0.1.3')
     HIREDIS_SUPPORTS_BYTE_BUFFER = \
-        hiredis_version >= LooseVersion('0.1.4')
+        hiredis_version >= Version('0.1.4')
     HIREDIS_SUPPORTS_ENCODING_ERRORS = \
-        hiredis_version >= LooseVersion('1.0.0')
+        hiredis_version >= Version('1.0.0')
 
     HIREDIS_USE_BYTE_BUFFER = True
     # only use byte buffer if hiredis supports it

requirements.txt

@@ -1 +1,2 @@
 deprecated
+packaging

setup.py

@@ -24,7 +24,8 @@
     author_email="oss@redis.com",
     python_requires=">=3.6",
     install_requires=[
-        'deprecated'
+        'deprecated==1.2.3',
+        'packaging==21.3',
     ],
     classifiers=[
         "Development Status :: 5 - Production/Stable",

tox.ini

@@ -108,7 +108,7 @@ extras =
 setenv =
     CLUSTER_URL = "redis://localhost:16379/0"
 commands =
-    redis: pytest --cov=./ --cov-report=xml:coverage_redis.xml -W always -m 'not onlycluster' {posargs}
+    standalone: pytest --cov=./ --cov-report=xml:coverage_redis.xml -W always -m 'not onlycluster' {posargs}
     cluster: pytest --cov=./ --cov-report=xml:coverage_cluster.xml -W always -m 'not onlynoncluster and not redismod' --redis-url={env:CLUSTER_URL:} {posargs}
 
 [testenv:devenv]