From 00e0d133784166f5fb67af6576fd02bf42d8ab8c Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 3 Dec 2021 16:23:01 +0100 Subject: [PATCH] setup.cfg: Block redis-py 4.0.0 and 4.0.1 but not >=4.0.2 (#542, #570) Upstream commit https://github.com/redis/redis-py/commit/d2b233384458869270352b8c99ca682ae480da5f that is included with redis-py >=4.0.2 adds method Redis.sentinel_masters by making class Redis inherit from SentinelCommands, where the related code resides. Related to issue #542, follow-up to pull request #570 This reverts (parts of) commit ef945d649c2a3b0c9ac9f517d532ad74f8278d2f. --- changelog.d/542.bugfix | 1 + changelog.d/576.misc | 1 + setup.cfg | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changelog.d/542.bugfix create mode 100644 changelog.d/576.misc diff --git a/changelog.d/542.bugfix b/changelog.d/542.bugfix new file mode 100644 index 00000000..b15bb65f --- /dev/null +++ b/changelog.d/542.bugfix @@ -0,0 +1 @@ +Block use with broken redis-py 4.0.0 and 4.0.1 diff --git a/changelog.d/576.misc b/changelog.d/576.misc new file mode 100644 index 00000000..b727fd0a --- /dev/null +++ b/changelog.d/576.misc @@ -0,0 +1 @@ +Unblock redis-py >=4.0.2 diff --git a/setup.cfg b/setup.cfg index d0f51d36..f094596b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -38,10 +38,10 @@ packages = django_redis.compressors install_requires = Django>=2.2 - redis>=3,<4 + redis>=3,!=4.0.0,!=4.0.1 [options.extras_require] -hiredis = redis[hiredis]>=3,<4 +hiredis = redis[hiredis]>=3,!=4.0.0,!=4.0.1 [coverage:run] omit =