From f4bfa26df8ddb28a6920981a3d82697d961d6144 Mon Sep 17 00:00:00 2001 From: Nirav Ark Date: Tue, 10 Sep 2024 17:06:14 -0400 Subject: [PATCH 1/4] fix mismatch in requirements.txt with code Signed-off-by: Nirav Ark --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cdfdc493..c919607e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -async-timeout>=4.0.3; python_version<"3.11" +async-timeout>=4.0.3; python_version<"3.11.3" From 0c76703665802adb370641a037ffbafbfdc81d7d Mon Sep 17 00:00:00 2001 From: Salvatore Mesoraca Date: Wed, 11 Sep 2024 10:00:31 +0200 Subject: [PATCH 2/4] setup.py: fix dependecy mismatch Signed-off-by: Salvatore Mesoraca --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 87a86377..a388c95a 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ author_email="valkey-py@lists.valkey.io", python_requires=">=3.8", install_requires=[ - 'async-timeout>=4.0.3; python_version<"3.11"', + 'async-timeout>=4.0.3; python_version<"3.11.3"', ], classifiers=[ "Development Status :: 5 - Production/Stable", From 1d6af85c5afd077358a7b0c6779737f9c883fa47 Mon Sep 17 00:00:00 2001 From: Mikhail Koviazin Date: Wed, 11 Sep 2024 10:21:44 +0200 Subject: [PATCH 3/4] parsers: fix leftover checks to match the one in asyncio/connection.py Signed-off-by: Mikhail Koviazin --- valkey/_parsers/base.py | 2 +- valkey/_parsers/libvalkey.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/valkey/_parsers/base.py b/valkey/_parsers/base.py index 0f9b10b1..f3af7ecc 100644 --- a/valkey/_parsers/base.py +++ b/valkey/_parsers/base.py @@ -3,7 +3,7 @@ from asyncio import IncompleteReadError, StreamReader, TimeoutError from typing import List, Optional, Union -if sys.version_info.major >= 3 and sys.version_info.minor >= 11: +if sys.version_info >= (3, 11, 3): from asyncio import timeout as async_timeout else: from async_timeout import timeout as async_timeout diff --git a/valkey/_parsers/libvalkey.py b/valkey/_parsers/libvalkey.py index ecd96a68..bf91c82c 100644 --- a/valkey/_parsers/libvalkey.py +++ b/valkey/_parsers/libvalkey.py @@ -3,7 +3,7 @@ import sys from typing import Callable, List, Optional, TypedDict, Union -if sys.version_info.major >= 3 and sys.version_info.minor >= 11: +if sys.version_info >= (3, 11, 3): from asyncio import timeout as async_timeout else: from async_timeout import timeout as async_timeout From 0f8b7c0d82fc13948b707785fb1414940ed036a5 Mon Sep 17 00:00:00 2001 From: Salvatore Mesoraca Date: Wed, 11 Sep 2024 10:26:01 +0200 Subject: [PATCH 4/4] ci: test against version 3.11.1 specifically there are some issues with asyncio-timeout in 3.11.1 and 3.11.2 We need to test at least 3.11.1 separatly Signed-off-by: Salvatore Mesoraca --- .github/workflows/integration.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index a7230931..207aa4ba 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -78,7 +78,7 @@ jobs: max-parallel: 15 fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.9', 'pypy-3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.11.1', '3.12', 'pypy-3.9', 'pypy-3.10'] test-type: ['standalone', 'cluster'] connection-type: ['libvalkey', 'plain'] protocol-version: ['2','3'] @@ -168,7 +168,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.9', 'pypy-3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.11.1', '3.12', 'pypy-3.9', 'pypy-3.10'] steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5