From 4f829e40c09fb16234c8a231d957ba7895b46c80 Mon Sep 17 00:00:00 2001 From: Pedro Paulo <62268905+devppjr@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:31:11 -0300 Subject: [PATCH] Bump dependencies (#16) * bump dependencies * black it --- .github/workflows/unittest.yaml | 2 +- setup.py | 14 +++++++------- tc_redis/base_storage.py | 23 ++++++++++++++++++----- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/.github/workflows/unittest.yaml b/.github/workflows/unittest.yaml index 600398c..37a73ec 100644 --- a/.github/workflows/unittest.yaml +++ b/.github/workflows/unittest.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.9", "3.10", "3.11", "3.12"] name: Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v2 diff --git a/setup.py b/setup.py index eea99ce..3e79759 100644 --- a/setup.py +++ b/setup.py @@ -14,18 +14,18 @@ def read(fname): TESTS_REQUIREMENTS = [ - "black==22.*,>=22.1.0", + "black==23.*,>=23.12.1", "preggy==1.*,>=1.4.4", - "pyssim==0.*,>=0.4", - "pytest==7.*,>=7.0.0", - "pytest-cov==3.*,>=3.0.0", - "pytest-asyncio==0.*,>=0.18.0", + "pyssim==0.*,>=0.7", + "pytest==7.*,>=7.4.3", + "pytest-cov==4.*,>=4.1.0", + "pytest-asyncio==0.*,>=0.23.2", ] RUNTIME_REQUIREMENTS = [ "redis==5.*,>=5.0.1", - "thumbor==7.*,>=7.0.6", - "pre-commit==2.*,>=2.17.0", + "thumbor==7.*,>=7.7.2", + "pre-commit==3.*,>=3.6.0", ] setup( diff --git a/tc_redis/base_storage.py b/tc_redis/base_storage.py index 010ef5d..e982d62 100644 --- a/tc_redis/base_storage.py +++ b/tc_redis/base_storage.py @@ -14,7 +14,6 @@ class RedisBaseStorage: - single_node_storage = None cluster_storage = None sentinel_storage = None @@ -29,7 +28,9 @@ def __init__(self, context, storage_type): "db": self.context.config.get("REDIS_STORAGE_SERVER_DB"), "host": self.context.config.get("REDIS_STORAGE_SERVER_HOST"), "instances": self.context.config.get( - "REDIS_CLUSTER_STORAGE_STARTUP_INSTANCES" if self.context.config.get("REDIS_STORAGE_MODE") == CLUSTER else "REDIS_SENTINEL_STORAGE_INSTANCES" + "REDIS_CLUSTER_STORAGE_STARTUP_INSTANCES" + if self.context.config.get("REDIS_STORAGE_MODE") == CLUSTER + else "REDIS_SENTINEL_STORAGE_INSTANCES" ), "master_instance": self.context.config.get( "REDIS_SENTINEL_STORAGE_MASTER_INSTANCE" @@ -56,7 +57,9 @@ def __init__(self, context, storage_type): "db": self.context.config.get("REDIS_RESULT_STORAGE_SERVER_DB"), "host": self.context.config.get("REDIS_RESULT_STORAGE_SERVER_HOST"), "instances": self.context.config.get( - "REDIS_CLUSTER_RESULT_STORAGE_STARTUP_INSTANCES" if self.context.config.get("REDIS_RESULT_STORAGE_MODE") == CLUSTER else "REDIS_SENTINEL_RESULT_STORAGE_INSTANCES" + "REDIS_CLUSTER_RESULT_STORAGE_STARTUP_INSTANCES" + if self.context.config.get("REDIS_RESULT_STORAGE_MODE") == CLUSTER + else "REDIS_SENTINEL_RESULT_STORAGE_INSTANCES" ), "master_instance": self.context.config.get( "REDIS_SENTINEL_RESULT_STORAGE_MASTER_INSTANCE" @@ -138,8 +141,18 @@ def connect_redis_single_node(self): ) def connect_redis_cluster(self): - instances_split = [tuple(instance.strip().split(":")) for instance in self.storage_values[self.storage_type]["instances"].split(",")] - instances = list(map(lambda x: ClusterNode(x[0], int(x[1] if len(x) == 2 else 6379)), instances_split)) + instances_split = [ + tuple(instance.strip().split(":")) + for instance in self.storage_values[self.storage_type]["instances"].split( + "," + ) + ] + instances = list( + map( + lambda x: ClusterNode(x[0], int(x[1] if len(x) == 2 else 6379)), + instances_split, + ) + ) if self.storage_values[self.storage_type]["password"] is None: return RedisCluster(