Merge pull request #764 from LincolnPuzey/replace-strictredis

Replace StrictRedis with Redis and bump redis version to >=4

Author: LincolnPuzey

CONTRIBUTORS.md

@@ -14,6 +14,7 @@ of those changes to CLEARTYPE SRL.
 | [@jssuzanne](https://github.com/jssuzanne)             | Jean-Sébastien Suzanne |
 | [@chen2aaron](https://github.com/chen2aaron)           | xixijun                |
 | [@aequitas](https://github.com/aequitas)               | Johan Bloemberg        |
+| [@udogri](https://github.com/udogri)                   | Udogri Oruaro          |
 | [@najamansari](https://github.com/najamansari)         | Najam Ahmed Ansari     |
 | [@rpkilby](https://github.com/rpkilby)                 | Ryan P Kilby           |
 | [@2miksyn](https://github.com/2miksyn)                 | Mikhail Smirnov        |

dramatiq/brokers/redis.py

@@ -120,8 +120,7 @@ def __init__(
         self.heartbeat_timeout = heartbeat_timeout
         self.dead_message_ttl = dead_message_ttl
         self.queues = set()
-        # TODO: Replace usages of StrictRedis (redis-py 2.x) with Redis in Dramatiq 2.0.
-        self.client = client or redis.StrictRedis(**parameters)
+        self.client = client or redis.Redis(**parameters)
         self.scripts = {name: self.client.register_script(script) for name, script in _scripts.items()}
 
     @property

dramatiq/rate_limits/backends/redis.py

@@ -40,8 +40,7 @@ def __init__(self, *, client=None, url=None, **parameters):
         if url is not None:
             parameters["connection_pool"] = redis.ConnectionPool.from_url(url)
 
-        # TODO: Replace usages of StrictRedis (redis-py 2.x) with Redis in Dramatiq 2.0.
-        self.client = client or redis.StrictRedis(**parameters)
+        self.client = client or redis.Redis(**parameters)
 
     def add(self, key, value, ttl):
         return bool(self.client.set(key, value, px=ttl, nx=True))

dramatiq/results/backends/redis.py

@@ -46,8 +46,7 @@ def __init__(self, *, namespace="dramatiq-results", encoder=None, client=None, u
         if url:
             parameters["connection_pool"] = redis.ConnectionPool.from_url(url)
 
-        # TODO: Replace usages of StrictRedis (redis-py 2.x) with Redis in Dramatiq 2.0.
-        self.client = client or redis.StrictRedis(**parameters)
+        self.client = client or redis.Redis(**parameters)
 
     def get_result(self, message, *, block=False, timeout=None):
         """Get a result from the backend.

setup.py

@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import annotations
+
 import os
 
 from setuptools import setup
@@ -53,7 +55,7 @@ def rel(*xs):
         "pika>=1.0,<2.0",
     ],
     "redis": [
-        "redis>=2.0,<7.0",
+        "redis>=4.0,<7.0",
     ],
     "watch": [
         "watchdog>=4.0",