Merge pull request #782 from mikeroll/remove-requeue-args

redis: Remove deprecated `requeue_{deadline,interval}` arguments

Author: LincolnPuzey

docs/source/changelog.rst

@@ -47,11 +47,15 @@ These are changes that while technically breaking, we believe are unlikely to ef
   This is only relevant if you have written custom code (such as a custom Rate Limiter)
   that uses a ``RateLimiterBackend``.
   (`#741`_, `#772`_, `@mikeroll`_)
+* The deprecated ``requeue_deadline`` and ``requeue_interval`` arguments of |RedisBroker| have been removed.
+  These have been deprecated and have had no effect since version 1.2.0.
+  (`#782`_, `@mikeroll`_)
 
 .. _#766: https://github.com/Bogdanp/dramatiq/pull/766
 .. _PEP-735: https://peps.python.org/pep-0735/
 .. _#741: https://github.com/Bogdanp/dramatiq/issues/741
 .. _#772: https://github.com/Bogdanp/dramatiq/pull/772
+.. _#782: https://github.com/Bogdanp/dramatiq/pull/782
 .. _@mikeroll: https://github.com/mikeroll
 
 Fixed

dramatiq/brokers/redis.py

@@ -20,7 +20,6 @@
 import glob
 import random
 import time
-import warnings
 from os import path
 from threading import Lock
 from typing import Optional
@@ -82,9 +81,7 @@ class RedisBroker(Broker):
         offline.
       dead_message_ttl(int): The amount of time (in ms) that
         dead-lettered messages are kept in Redis for.
-      requeue_deadline(int): Deprecated.  Does nothing.
-      requeue_interval(int): Deprecated.  Does nothing.
-      client(redis.StrictRedis): A redis client to use.
+      client(redis.Redis): A redis client to use.
       **parameters: Connection parameters are passed directly
         to :class:`redis.Redis`.
 
@@ -100,8 +97,6 @@ def __init__(
         maintenance_chance=DEFAULT_MAINTENANCE_CHANCE,
         heartbeat_timeout=DEFAULT_HEARTBEAT_TIMEOUT,
         dead_message_ttl=DEFAULT_DEAD_MESSAGE_TTL,
-        requeue_deadline=None,
-        requeue_interval=None,
         client=None,
         **parameters,
     ):
@@ -110,10 +105,6 @@ def __init__(
         if url:
             parameters["connection_pool"] = redis.ConnectionPool.from_url(url)
 
-        if requeue_deadline or requeue_interval:
-            message = "requeue_{deadline,interval} have been deprecated and no longer do anything"
-            warnings.warn(message, DeprecationWarning, stacklevel=2)
-
         self.broker_id = str(uuid4())
         self.namespace = namespace
         self.maintenance_chance = maintenance_chance

tests/test_redis.py

@@ -332,15 +332,6 @@ def test_redis_broker_can_connect_via_client():
     assert broker.client is client
 
 
-def test_redis_broker_warns_about_deprecated_parameters():
-    # When I pass deprecated params to RedisBroker
-    # Then it should warn me that those params do nothing
-    with pytest.warns(DeprecationWarning) as record:
-        RedisBroker(requeue_deadline=1000)
-
-    assert str(record[0].message) == "requeue_{deadline,interval} have been deprecated and no longer do anything"
-
-
 def test_redis_broker_raises_attribute_error_when_given_an_invalid_attribute(redis_broker):
     # Given that I have a Redis broker
     # When I try to access an attribute that doesn't exist