redis-py replaces aioredis

madkote · Sep 19, 2022 · c4e8d94 · c4e8d94
1 parent d2c9a59
commit c4e8d94
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,6 @@
 # Changes
+## 0.11.0 (2022-09-19)
+- `[feature]` `redis-py` replaces `aioredis`
 ## 0.10.0 (2022-07-07)
 - `[feature]` Update `aioredis` to `2.x.x`
 - `[feature]` Add `fakeredis` optionally for development purpose

diff --git a/alt_requirements/requirements_redis.txt b/alt_requirements/requirements_redis.txt
@@ -1,2 +1,2 @@
 -r requirements_core.txt
-aioredis[hiredis]>=2.0.*
+redis[hiredis]>=4.3.*
diff --git a/fastapi_plugins/_redis.py b/fastapi_plugins/_redis.py
@@ -16,10 +16,10 @@
 import enum
 import typing
 
-import aioredis  # @UnusedImport
-import aioredis.sentinel
 import fastapi
 import pydantic
+import redis.asyncio as aioredis
+import redis.asyncio.sentinel as aioredis_sentinel
 import starlette.requests
 import tenacity
 
@@ -117,7 +117,7 @@ class RedisPlugin(Plugin, ControlHealthMixin):
     DEFAULT_CONFIG_CLASS = RedisSettings
 
     def _on_init(self) -> None:
-        self.redis: typing.Union[aioredis.Redis, aioredis.sentinel.Sentinel] = None # noqa E501
+        self.redis: typing.Union[aioredis.Redis, aioredis_sentinel.Sentinel] = None # noqa E501
 
     async def _on_call(self) -> typing.Any:
         if self.redis is None:
@@ -177,7 +177,7 @@ async def init(self):
                 method = fakeredis.aioredis.FakeRedis.from_url
         elif self.config.redis_type == RedisType.sentinel:
             address = self.config.get_sentinels()
-            method = aioredis.sentinel.Sentinel
+            method = aioredis_sentinel.Sentinel
         else:
             raise NotImplementedError(
                 'Redis type %s is not implemented' % self.config.redis_type

diff --git a/fastapi_plugins/version.py b/fastapi_plugins/version.py
@@ -13,7 +13,7 @@
 
 from __future__ import absolute_import
 
-VERSION = (0, 10, 0)
+VERSION = (0, 11, 0)
 
 __all__ = []
 __author__ = 'madkote <madkote(at)bluewin.ch>'

diff --git a/setup.py b/setup.py
@@ -86,7 +86,7 @@ def _read():
     'tenacity>=8.0.*'
 ]
 REQUIRES_INSTALL += ['python-json-logger>=2.0.*']
-REQUIRES_INSTALL += ['aioredis[hiredis]>=2.0.*']
+REQUIRES_INSTALL += ['redis[hiredis]>=4.3.*']
 REQUIRES_INSTALL += ['aiojobs>=1.0.*']
 
 REQUIRES_FAKEREDIS = ['fakeredis[lua]>=1.8.*']

diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
@@ -19,7 +19,7 @@
 import uuid
 
 import aiojobs
-import aioredis
+import redis.asyncio as aioredis
 import fastapi
 import pytest
 import starlette.testclient