Replace distutils.version with packaging.version

bmerry · bmerry · commit ff1861c24962 · 2021-08-16T12:13:31.000+02:00
distutils is going to be deprecated (PEP 632), and packaging is the
recommended replacement.

This does end up requiring that the redis server version is a valid PEP
440 string, but that's only relevant during the unit tests so if redis
does go to a weird versioning scheme it won't affect users directly.
diff --git a/fakeredis/aioredis.py b/fakeredis/aioredis.py
@@ -1,9 +1,8 @@
-import distutils.version
-
 import aioredis
+import packaging.version
 
 
-if aioredis.__version__ >= distutils.version.StrictVersion('2.0.0a1'):
+if packaging.version.Version(aioredis.__version__) >= packaging.version.Version('2.0.0a1'):
     from ._aioredis2 import FakeConnection, FakeRedis  # noqa: F401
 else:
     from ._aioredis1 import (  # noqa: F401
diff --git a/setup.cfg b/setup.cfg
@@ -22,6 +22,7 @@ classifiers =
 [options]
 packages = fakeredis
 install_requires =
+    packaging
     # Minor version updates to redis tend to break fakeredis. If you
     # need to use fakeredis with a newer redis, please submit a PR that
     # relaxes this restriction and adds it to the Github Actions tests.
diff --git a/test/test_aioredis1.py b/test/test_aioredis1.py
@@ -1,14 +1,14 @@
 import asyncio
-import distutils.version
 
+from packaging.version import Version
 import pytest
 import aioredis
 from async_generator import yield_, async_generator
 
 import fakeredis.aioredis
 
 
-aioredis2 = aioredis.__version__ >= distutils.version.StrictVersion('2.0.0a1')
+aioredis2 = Version(aioredis.__version__) >= Version('2.0.0a1')
 pytestmark = [
     pytest.mark.asyncio,
     pytest.mark.skipif(aioredis2, reason="Test is only applicable to aioredis 1.x")
diff --git a/test/test_aioredis2.py b/test/test_aioredis2.py
@@ -1,7 +1,7 @@
 import asyncio
-import distutils.version
 import re
 
+from packaging.version import Version
 import pytest
 import aioredis
 import async_timeout
@@ -10,7 +10,7 @@
 import fakeredis.aioredis
 
 
-aioredis2 = aioredis.__version__ >= distutils.version.StrictVersion('2.0.0a1')
+aioredis2 = Version(aioredis.__version__) >= Version('2.0.0a1')
 pytestmark = [
     pytest.mark.asyncio,
     pytest.mark.skipif(not aioredis2, reason="Test is only applicable to aioredis 2.x")
diff --git a/test/test_fakeredis.py b/test/test_fakeredis.py
@@ -6,9 +6,9 @@
 import threading
 import logging
 from queue import Queue
-import distutils.version
 
 import six
+from packaging.version import Version
 import pytest
 import redis
 import redis.client
@@ -17,8 +17,8 @@
 from datetime import datetime, timedelta
 
 
-REDIS_VERSION = distutils.version.LooseVersion(redis.__version__)
-REDIS3 = REDIS_VERSION >= '3'
+REDIS_VERSION = Version(redis.__version__)
+REDIS3 = REDIS_VERSION >= Version('3')
 
 
 redis2_only = pytest.mark.skipif(REDIS3, reason="Test is only applicable to redis-py 2.x")
@@ -99,8 +99,8 @@ def factory(db=0):
             min_server_marker = request.node.get_closest_marker('min_server')
             if min_server_marker is not None:
                 server_version = conn.info()['redis_version']
-                min_version = min_server_marker.args[0]
-                if distutils.version.LooseVersion(server_version) < min_version:
+                min_version = Version(min_server_marker.args[0])
+                if Version(server_version) < min_version:
                     pytest.skip(
                         'Redis server {} required but {} found'.format(min_version, server_version)
                     )
@@ -729,7 +729,7 @@ def test_set_px_using_timedelta(r):
     assert r.get('foo') == b'bar'
 
 
-@pytest.mark.skipif(REDIS_VERSION < '3.5', reason="Test is only applicable to redis-py 3.5+")
+@pytest.mark.skipif(REDIS_VERSION < Version('3.5'), reason="Test is only applicable to redis-py 3.5+")
 @pytest.mark.min_server('6.0')
 def test_set_keepttl(r):
     r.set('foo', 'bar', ex=100)
@@ -743,7 +743,7 @@ def test_set_conflicting_expire_options(r):
         r.set('foo', 'bar', ex=1, px=1)
 
 
-@pytest.mark.skipif(REDIS_VERSION < '3.5', reason="Test is only applicable to redis-py 3.5+")
+@pytest.mark.skipif(REDIS_VERSION < Version('3.5'), reason="Test is only applicable to redis-py 3.5+")
 def test_set_conflicting_expire_options_w_keepttl(r):
     with pytest.raises(ResponseError):
         r.set('foo', 'bar', ex=1, keepttl=True)
@@ -1682,7 +1682,7 @@ def test_scan_iter_multiple_pages_with_match(r):
     assert actual == set(all_keys)
 
 
-@pytest.mark.skipif(REDIS_VERSION < '3.5', reason="Test is only applicable to redis-py 3.5+")
+@pytest.mark.skipif(REDIS_VERSION < Version('3.5'), reason="Test is only applicable to redis-py 3.5+")
 @pytest.mark.min_server('6.0')
 def test_scan_iter_multiple_pages_with_type(r):
     all_keys = key_val_dict(size=100)
@@ -2101,7 +2101,7 @@ def test_zadd_with_nx_and_xx(r, ch):
         zadd(r, 'foo', {'four': -4.0, 'three': -3.0}, nx=True, xx=True, ch=ch)
 
 
-@pytest.mark.skipif(REDIS_VERSION < '3.1', reason="Test is only applicable to redis-py 3.1+")
+@pytest.mark.skipif(REDIS_VERSION < Version('3.1'), reason="Test is only applicable to redis-py 3.1+")
 @pytest.mark.parametrize('ch', [False, True])
 def test_zadd_incr(r, ch):
     zadd(r, 'foo', {'four': 4.0, 'three': 3.0})
@@ -3335,7 +3335,7 @@ def test_pipeline_no_commands(r):
     p = r.pipeline()
     p.watch('foo')
     r.set('foo', '2')
-    if REDIS_VERSION >= '3.4':
+    if REDIS_VERSION >= Version('3.4'):
         with pytest.raises(redis.WatchError):
             p.execute()
     else:
@@ -3781,7 +3781,7 @@ def test_pubsub_run_in_thread(r):
         pytest.param(
             None,
             marks=pytest.mark.skipif(
-                REDIS_VERSION >= "3.2" and REDIS_VERSION < "3.3",
+                Version("3.2") <= REDIS_VERSION < Version("3.3"),
                 reason="This test is not applicable to redis-py 3.2"
             )
         )
@@ -4694,7 +4694,7 @@ def test_unlink(r):
     assert r.get('foo') is None
 
 
-@pytest.mark.skipif(REDIS_VERSION < "3.4", reason="Test requires redis-py 3.4+")
+@pytest.mark.skipif(REDIS_VERSION < Version("3.4"), reason="Test requires redis-py 3.4+")
 @pytest.mark.fake
 def test_socket_cleanup_pubsub(fake_server):
     r1 = fakeredis.FakeStrictRedis(server=fake_server)
