bump version v1.1.0

Author: user

.gitignore

@@ -110,6 +110,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+venv_aioredis_1/
 
 # Spyder project settings
 .spyderproject

CHANGELOG.md

@@ -1,14 +1,21 @@
 # Changelog
 
+
+## 1.1.0
+
+ - Can use `aioredis` `2.x` or `>=1.3.x`
+
+
 ## 1.0.1
 
  - Minor bug patch
 
+
 ## 1.0.0
 
  - Change [Pydantic](https://pydantic-docs.helpmanual.io/) to [Dataclasess](https://docs.python.org/3/library/dataclasses.html)
 
+
 ## 0.x.x
 
  - Initial release
-

RSO/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.1"
+__version__ = "1.1.0"

RSO/aioredis/index.py

@@ -1,8 +1,15 @@
-from aioredis.client import Pipeline, Redis
+from aioredis import __version__ as ar_version
+try:
+    from aioredis.client import Redis, Pipeline
+except ModuleNotFoundError:
+    from aioredis.commands import Redis, Pipeline
 
 from RSO.base import BaseIndex, BaseModel
 
 
+old_aioredis = ar_version < '2.0.0'
+
+
 class HashIndex(BaseIndex):
 
     @property
@@ -13,9 +20,14 @@ def redis_key(self):
 
     async def save_index(self, redis: Pipeline):
         index_value = getattr(self.__model__, self.__key__)
-        redis.hmset(self.redis_key, {
-            index_value: self._model_key_value
-        })
+        if old_aioredis:
+            redis.hmset_dict(self.redis_key, {
+                index_value: self._model_key_value
+            })
+        else:
+            redis.hmset(self.redis_key, {
+                index_value: self._model_key_value
+            })
 
     @classmethod
     async def search_model(

RSO/aioredis/model.py

@@ -1,11 +1,18 @@
 from dataclasses import asdict
 from typing import Union
 
-from aioredis.client import Redis, Pipeline
+from aioredis import __version__ as ar_version
+try:
+    from aioredis.client import Redis, Pipeline
+except ModuleNotFoundError:
+    from aioredis.commands import Redis, Pipeline
 
 from RSO.base import BaseModel
 
 
+old_aioredis = ar_version < '2.0.0'
+
+
 class Model(BaseModel):
     class Config:
         orm_mode = True
@@ -25,7 +32,11 @@ async def save(self, redis: Union[Pipeline, Redis]):
         else:
             pipe = redis.pipeline()
 
-        pipe.hmset(self.redis_key, self.to_redis())
+        if old_aioredis:
+            pipe.hmset_dict(self.redis_key, self.to_redis())
+        else:
+            pipe.hmset(self.redis_key, self.to_redis())
+
         for index_class in self.__indexes__:
             index = index_class.create_from_model(self)
             if getattr(self, index_class.__key__) is None:
@@ -38,6 +49,7 @@ async def search(cls, redis: Redis, value):
         redis_key = cls._to_redis_key(value)
         if bool(await redis.exists(redis_key)) is True:
             redis_data = await redis.hgetall(redis_key)
+            print(redis_data)
             return cls(**redis_data)
         else:
             return None

tests/conftest.py

@@ -1,5 +1,6 @@
 import pytest
 
+import aioredis as aioredis_
 from fakeredis import FakeRedis, aioredis
 
 
@@ -12,6 +13,9 @@ def sync_redis():
 
 @pytest.fixture
 async def async_redis():
-	return await aioredis.FakeRedis(
-		decode_responses=True, encoding='utf-8'
-	)
+	if aioredis_.__version__ >= '2.0.0':
+		return await aioredis.FakeRedis(
+			decode_responses=True, encoding='utf-8'
+		)
+	else:
+		return await aioredis.create_redis(encoding='utf-8')