From 58667870cfef570456cc23a2a8c7ef0b853fd7c6 Mon Sep 17 00:00:00 2001 From: vladvildanov Date: Mon, 29 Jul 2024 13:48:30 +0300 Subject: [PATCH 1/6] Added testing against latest stack image --- .github/workflows/integration.yaml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 2b62664920..48c648a30c 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -26,7 +26,7 @@ permissions: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} REDIS_IMAGE: redis:7.4-rc2 - REDIS_STACK_IMAGE: redis/redis-stack-server:7.4.0-rc2 + REDIS_STACK_IMAGE: redis/redis-stack-server:latest jobs: dependency-audit: diff --git a/docker-compose.yml b/docker-compose.yml index c8528a7d58..4156c6e47f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -105,7 +105,7 @@ services: - all redis-stack: - image: ${REDIS_STACK_IMAGE:-redis/redis-stack-server:edge} + image: ${REDIS_STACK_IMAGE:-redis/redis-stack-server:latest} container_name: redis-stack ports: - 6479:6379 From 648be939bfac8985108227e873106f794be2348a Mon Sep 17 00:00:00 2001 From: vladvildanov Date: Mon, 29 Jul 2024 13:49:23 +0300 Subject: [PATCH 2/6] Updated to specific image --- .github/workflows/integration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 48c648a30c..ca76f4a618 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -26,7 +26,7 @@ permissions: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} REDIS_IMAGE: redis:7.4-rc2 - REDIS_STACK_IMAGE: redis/redis-stack-server:latest + REDIS_STACK_IMAGE: redis/redis-stack-server:7.4.0-v0 jobs: dependency-audit: From 92038f123340e7198a6139a0a9fb1bcb7690b139 Mon Sep 17 00:00:00 2001 From: vladvildanov Date: Mon, 29 Jul 2024 13:59:33 +0300 Subject: [PATCH 3/6] Updated package version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 92f2ef9742..4cd6636cdb 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ long_description_content_type="text/markdown", keywords=["Redis", "key-value store", "database"], license="MIT", - version="5.0.7", + version="5.0.8", packages=find_packages( include=[ "redis", From 86b7e949ace5ba65d0a4f47dcd338c749fd4d128 Mon Sep 17 00:00:00 2001 From: vladvildanov Date: Mon, 29 Jul 2024 14:13:45 +0300 Subject: [PATCH 4/6] Restrict hiredis version to 2.x --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4cd6636cdb..13e23dd02b 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ "Programming Language :: Python :: Implementation :: PyPy", ], extras_require={ - "hiredis": ["hiredis>=1.0.0"], + "hiredis": ["hiredis<3.0.0"], "ocsp": ["cryptography>=36.0.1", "pyopenssl==20.0.1", "requests>=2.26.0"], }, ) From 28256123193ecaafa319b6f77df3ec5c12c1a66d Mon Sep 17 00:00:00 2001 From: vladvildanov Date: Mon, 29 Jul 2024 14:28:43 +0300 Subject: [PATCH 5/6] Pinend hiredis version to ~= 2.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 13e23dd02b..40a6bc0c35 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ "Programming Language :: Python :: Implementation :: PyPy", ], extras_require={ - "hiredis": ["hiredis<3.0.0"], + "hiredis": ["hiredis~=2.0"], "ocsp": ["cryptography>=36.0.1", "pyopenssl==20.0.1", "requests>=2.26.0"], }, ) From e35ca3756c848505911873f3339c69d74a66346e Mon Sep 17 00:00:00 2001 From: vladvildanov Date: Mon, 29 Jul 2024 14:36:55 +0300 Subject: [PATCH 6/6] Updated hiredis version dependency --- .github/workflows/integration.yaml | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index ca76f4a618..9fab78dfd1 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -80,7 +80,7 @@ jobs: pip install -r requirements.txt pip install -r dev_requirements.txt if [ "${{matrix.connection-type}}" == "hiredis" ]; then - pip install hiredis + pip install "hiredis>=2.0.0,<3.0.0" fi invoke devenv sleep 10 # time to settle @@ -136,7 +136,7 @@ jobs: pip install -r requirements.txt pip install -r dev_requirements.txt if [ "${{matrix.connection-type}}" == "hiredis" ]; then - pip install hiredis + pip install "hiredis>=2.0.0,<3.0.0" fi invoke devenv sleep 10 # time to settle diff --git a/setup.py b/setup.py index 40a6bc0c35..4199b6b7ad 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ "Programming Language :: Python :: Implementation :: PyPy", ], extras_require={ - "hiredis": ["hiredis~=2.0"], + "hiredis": ["hiredis>1.0.0"], "ocsp": ["cryptography>=36.0.1", "pyopenssl==20.0.1", "requests>=2.26.0"], }, )