feat: upgrade to redis-py6 as it supports all python and redis versions

Author: Nicolas Steinmetz

arq/connections.py

@@ -49,7 +49,6 @@ class RedisSettings:
     sentinel: bool = False
     sentinel_master: str = 'mymaster'
 
-    retry_on_timeout: bool = False
     retry_on_error: Optional[list[Exception]] = None
     retry: Optional[Retry] = None
 
@@ -263,7 +262,6 @@ def pool_factory(*args: Any, **kwargs: Any) -> ArqRedis:
             ssl_ca_data=settings.ssl_ca_data,
             ssl_check_hostname=settings.ssl_check_hostname,
             retry=settings.retry,
-            retry_on_timeout=settings.retry_on_timeout,
             retry_on_error=settings.retry_on_error,
             max_connections=settings.max_connections,
         )

pyproject.toml

@@ -38,7 +38,7 @@ classifiers = [
 ]
 requires-python = '>=3.9'
 dependencies = [
-    'redis[hiredis]>=5.3.0,<6',
+    'redis[hiredis]>=6.0,<7',
     'click>=8.0,<8.2',
 ]
 optional-dependencies = {watch = ['watchfiles>=1.0'] }

requirements/pyproject.txt

@@ -12,9 +12,7 @@ hiredis==3.1.1
     # via redis
 idna==3.10
     # via anyio
-pyjwt==2.9.0
-    # via redis
-redis==5.3.0
+redis==6.1.0
     # via arq (pyproject.toml)
 sniffio==1.3.1
     # via anyio

tests/conftest.py

@@ -82,7 +82,6 @@ async def arq_redis_retry(test_redis_host: str, test_redis_port: int):
         port=test_redis_port,
         encoding='utf-8',
         retry=Retry(backoff=NoBackoff(), retries=3),
-        retry_on_timeout=True,
         retry_on_error=[redis.exceptions.ConnectionError],
     )
     await redis_.flushall()

tests/test_utils.py

@@ -23,7 +23,7 @@ def test_settings_changed():
         "ssl=False, ssl_keyfile=None, ssl_certfile=None, ssl_cert_reqs='required', ssl_ca_certs=None, "
         'ssl_ca_data=None, ssl_check_hostname=False, conn_timeout=1, conn_retries=5, conn_retry_delay=1, '
         "max_connections=None, sentinel=False, sentinel_master='mymaster', "
-        'retry_on_timeout=False, retry_on_error=None, retry=None)'
+        'retry_on_error=None, retry=None)'
     ) == str(settings)
 
 
@@ -221,7 +221,6 @@ def test_settings_plain():
         'conn_retry_delay': 1,
         'sentinel': False,
         'sentinel_master': 'mymaster',
-        'retry_on_timeout': False,
         'retry_on_error': None,
         'retry': None,
         'max_connections': None,
@@ -250,7 +249,6 @@ def test_settings_from_socket_dsn():
         'conn_retry_delay': 1,
         'sentinel': False,
         'sentinel_master': 'mymaster',
-        'retry_on_timeout': False,
         'retry_on_error': None,
         'retry': None,
         'max_connections': None,

tests/test_worker.py

@@ -1058,79 +1058,3 @@ async def test_worker_timezone_defaults_to_system_timezone(worker):
     worker = worker(functions=[func(foobar)])
     assert worker.timezone is not None
     assert worker.timezone == datetime.now().astimezone().tzinfo
-
-
-@pytest.mark.parametrize(
-    'exception_thrown',
-    [
-        redis.exceptions.ConnectionError('Error while reading from host'),
-        redis.exceptions.TimeoutError('Timeout reading from host'),
-    ],
-)
-async def test_worker_retry(mocker, worker_retry, exception_thrown):
-    # Testing redis exceptions, with retry settings specified
-    worker = worker_retry(functions=[func(foobar)])
-
-    # patch db read_response to mimic connection exceptions
-    p = patch.object(worker.pool.connection_pool.connection_class, 'read_response', side_effect=exception_thrown)
-
-    # baseline
-    await worker.main()
-    await worker._poll_iteration()
-
-    # spy method handling call_with_retry failure
-    spy = mocker.spy(worker.pool, '_disconnect_raise')
-
-    try:
-        # start patch
-        p.start()
-
-        # assert exception thrown
-        with pytest.raises(type(exception_thrown)):
-            await worker._poll_iteration()
-
-        # assert retry counts and no exception thrown during '_disconnect_raise'
-        assert spy.call_count == 4  # retries setting + 1
-        assert spy.spy_exception is None
-
-    finally:
-        # stop patch to allow worker cleanup
-        p.stop()
-
-
-@pytest.mark.parametrize(
-    'exception_thrown',
-    [
-        redis.exceptions.ConnectionError('Error while reading from host'),
-        redis.exceptions.TimeoutError('Timeout reading from host'),
-    ],
-)
-async def test_worker_crash(mocker, worker, exception_thrown):
-    # Testing redis exceptions, no retry settings specified
-    worker = worker(functions=[func(foobar)])
-
-    # patch db read_response to mimic connection exceptions
-    p = patch.object(worker.pool.connection_pool.connection_class, 'read_response', side_effect=exception_thrown)
-
-    # baseline
-    await worker.main()
-    await worker._poll_iteration()
-
-    # spy method handling call_with_retry failure
-    spy = mocker.spy(worker.pool, '_disconnect_raise')
-
-    try:
-        # start patch
-        p.start()
-
-        # assert exception thrown
-        with pytest.raises(type(exception_thrown)):
-            await worker._poll_iteration()
-
-        # assert no retry counts and exception thrown during '_disconnect_raise'
-        assert spy.call_count == 1
-        assert spy.spy_exception == exception_thrown
-
-    finally:
-        # stop patch to allow worker cleanup
-        p.stop()