14
0
forked from pool/python-redis

10 Commits

Author SHA256 Message Date
116ab5d11c Accepting request 1315971 from devel:languages:python
Forwarded request #1315726 from ateixeira

- Rewrite logic for skipping tests
    * Add skipped_tests
    * Move list of skipped tests from spec to skipped_tests
    * Add list of tests that need to be skipped exclusively for valkey
  - Update valkey skipped test list to fix test suite with valkey >= 9.0.0
    (bsc#1252957)
  - Update general skipped test list with tests that fail in aarch64 and i586
  - Add redis_opts rpm macro
    * Allows us to properly check for redis/valkey >= 7.0.0, instead of
      grepping for known major versions when adding the needed cli options

OBS-URL: https://build.opensuse.org/request/show/1315971
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-redis?expand=0&rev=48
2025-11-07 17:20:54 +00:00
673e16e503 - Rewrite logic for skipping tests
* Add skipped_tests
  * Move list of skipped tests from spec to skipped_tests
  * Add list of tests that need to be skipped exclusively for valkey
- Update valkey skipped test list to fix test suite with valkey >= 9.0.0
  (bsc#1252957)
- Update general skipped test list with tests that fail in aarch64 and i586
- Add redis_opts rpm macro
  * Allows us to properly check for redis/valkey >= 7.0.0, instead of
    grepping for known major versions when adding the needed cli options

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-redis?expand=0&rev=109
2025-11-06 09:54:44 +00:00
3564ba5b23 Accepting request 1315210 from devel:languages:python
- Update to 7.0.1: (bsc#1252957)
  * New Features
    + Support for maintenance push notifications handling during server
      upgrade or maintenance procedures.
    + Adding WITHATTRIBS option to vector set's vsim command.
    + Adding ssl_verify_flags_config argument for ssl connection
      configuration
    + Adding new ExternalAuthProviderError that will be raised when we
      receive 'problem with LDAP service' response from server.
  * Experimental Features
    + Multi-database client implementation 
  * Breaking changes
    + Adding abstract method declaration for cache property setter in
      EvictionPolicyInterface
    + Removing synchronous context manager handling from async RedisCluster.
    + Removing the threading.Lock locks and replacing them with RLock objects
      to avoid deadlocks.
    + Adding score_cast_func argument to zrank, zrevrank and zunion - for
      consistency with the other sorted sets commands
- Refreshed patch remove-mock.patch

- update to 6.4.0:
  * Added epsilon property to the vsim command
- update to 6.3.0:
  * Add support for new BITOP operations: DIFF, DIFF1, ANDOR, ONE
  * Support new VAMANA vector index type
  * Add new stream commands
  * add async Retry __eq__ and __hash__ & fix
    ExponentialWithJitterBackoff __eq__
  * Fixing sentinel command execution to allow returning of

OBS-URL: https://build.opensuse.org/request/show/1315210
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-redis?expand=0&rev=47
2025-11-05 15:17:43 +00:00
7902d019f2 - Update to 7.0.1: (bsc#1252957)
* New Features
    + Support for maintenance push notifications handling during server
      upgrade or maintenance procedures.
    + Adding WITHATTRIBS option to vector set's vsim command.
    + Adding ssl_verify_flags_config argument for ssl connection
      configuration
    + Adding new ExternalAuthProviderError that will be raised when we
      receive 'problem with LDAP service' response from server.
  * Experimental Features
    + Multi-database client implementation 
  * Breaking changes
    + Adding abstract method declaration for cache property setter in
      EvictionPolicyInterface
    + Removing synchronous context manager handling from async RedisCluster.
    + Removing the threading.Lock locks and replacing them with RLock objects
      to avoid deadlocks.
    + Adding score_cast_func argument to zrank, zrevrank and zunion - for
      consistency with the other sorted sets commands
- Refreshed patch remove-mock.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-redis?expand=0&rev=107
2025-11-03 04:00:08 +00:00
ab0376faf0 - update to 6.4.0:
* Added epsilon property to the vsim command
- update to 6.3.0:
  * Add support for new BITOP operations: DIFF, DIFF1, ANDOR, ONE
  * Support new VAMANA vector index type
  * Add new stream commands
  * add async Retry __eq__ and __hash__ & fix
    ExponentialWithJitterBackoff __eq__
  * Fixing sentinel command execution to allow returning of
    actual responses when meaningful - behaviour controlled by
    'return_responses' argument.
  * Annotate deprecated_args decorator to preserve wrapped
    function type signature
  * Fix ConnectionPool to raise MaxConnectionsError instead of
    Connection…
  * add async Retry __eq__ and __hash__ & fix
    ExponentialWithJitterBackoff __eq__
  * SentinelManagedConnection searches for new master upon
    connection failure (#3560)

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-redis?expand=0&rev=106
2025-09-30 12:35:04 +00:00
ddd5a43f6b Accepting request 1289331 from devel:languages:python
OBS-URL: https://build.opensuse.org/request/show/1289331
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-redis?expand=0&rev=46
2025-07-02 10:07:16 +00:00
af3f271c65 - Added test_add_elem_no_quant.patch to fix test on 32 bit archs.
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-redis?expand=0&rev=104
2025-06-30 17:18:57 +00:00
7437248b67 Accepting request 1285097 from devel:languages:python
- Remove not needed pytest.ini source file.

- Update to 6.2.0:
  * https://github.com/redis/redis-py/releases/tag/v6.2.0
  * https://github.com/redis/redis-py/releases/tag/v6.1.0
  * https://github.com/redis/redis-py/releases/tag/v6.0.0
  * https://github.com/redis/redis-py/releases/tag/v5.3.0
- Drop pytest-asyncio-045.patch
  * Fixed upstream
- Add remove-mock.patch
  * Use built-in unittest.mock
- Don't remove test_graph.py
  * The test was dropped upstream
- Add new python-redis-entraid and pytest-mock dependencies for tests
- Add new hatchling build requirement
  * Remove setuptools which is no longer needed
- Move test suite to separate flavor to avoid dependency cycle with
  python-redis-entraid
  * Add _multibuild
  * Move some dependencies that were only needed for tests to the new
    flavor
- Update skipped test list due to gh#python/cpython#70654
  * Skip test_re_auth_pub_sub_in_resp3
  * Skip test_do_not_re_auth_pub_sub_in_resp2

OBS-URL: https://build.opensuse.org/request/show/1285097
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-redis?expand=0&rev=45
2025-06-13 16:42:23 +00:00
956291d98c - Remove not needed pytest.ini source file.
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-redis?expand=0&rev=102
2025-06-12 10:31:30 +00:00
1e31050b26 Tests depend on https://build.opensuse.org/request/show/1284860
- Update to 6.2.0:
  * https://github.com/redis/redis-py/releases/tag/v6.2.0
  * https://github.com/redis/redis-py/releases/tag/v6.1.0
  * https://github.com/redis/redis-py/releases/tag/v6.0.0
  * https://github.com/redis/redis-py/releases/tag/v5.3.0
- Drop pytest-asyncio-045.patch
  * Fixed upstream
- Add remove-mock.patch
  * Use built-in unittest.mock
- Don't remove test_graph.py
  * The test was dropped upstream
- Add new python-redis-entraid and pytest-mock dependencies for tests
- Add new hatchling build requirement
  * Remove setuptools and wheel which is longer needed
- Move test suite to separate flavor to avoid dependency cycle with
  python-redis-entraid
  * Add _multibuild
  * Move some dependencies that were only needed for tests to the new
    flavor
- Update skipped test list due to gh#python/cpython#70654
  * Skip test_re_auth_pub_sub_in_resp3
  * Skip test_do_not_re_auth_pub_sub_in_resp2

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-redis?expand=0&rev=101
2025-06-12 08:01:07 +00:00
11 changed files with 310 additions and 139 deletions

4
_multibuild Normal file
View File

@@ -0,0 +1,4 @@
<multibuild>
<package>test</package>
</multibuild>

View File

@@ -1,74 +0,0 @@
Index: python-redis/redis-5.2.1/tests/test_asyncio/test_scripting.py
===================================================================
--- python-redis.orig/redis-5.2.1/tests/test_asyncio/test_scripting.py
+++ python-redis/redis-5.2.1/tests/test_asyncio/test_scripting.py
@@ -28,14 +28,14 @@ class TestScripting:
yield redis
await redis.script_flush()
- @pytest.mark.asyncio(forbid_global_loop=True)
+ @pytest.mark.asyncio()
async def test_eval(self, r):
await r.flushdb()
await r.set("a", 2)
# 2 * 3 == 6
assert await r.eval(multiply_script, 1, "a", 3) == 6
- @pytest.mark.asyncio(forbid_global_loop=True)
+ @pytest.mark.asyncio()
@skip_if_server_version_lt("6.2.0")
async def test_script_flush(self, r):
await r.set("a", 2)
@@ -55,14 +55,14 @@ class TestScripting:
await r.script_load(multiply_script)
await r.script_flush("NOTREAL")
- @pytest.mark.asyncio(forbid_global_loop=True)
+ @pytest.mark.asyncio()
async def test_evalsha(self, r):
await r.set("a", 2)
sha = await r.script_load(multiply_script)
# 2 * 3 == 6
assert await r.evalsha(sha, 1, "a", 3) == 6
- @pytest.mark.asyncio(forbid_global_loop=True)
+ @pytest.mark.asyncio()
async def test_evalsha_script_not_loaded(self, r):
await r.set("a", 2)
sha = await r.script_load(multiply_script)
@@ -71,7 +71,7 @@ class TestScripting:
with pytest.raises(exceptions.NoScriptError):
await r.evalsha(sha, 1, "a", 3)
- @pytest.mark.asyncio(forbid_global_loop=True)
+ @pytest.mark.asyncio()
async def test_script_loading(self, r):
# get the sha, then clear the cache
sha = await r.script_load(multiply_script)
@@ -80,7 +80,7 @@ class TestScripting:
await r.script_load(multiply_script)
assert await r.script_exists(sha) == [True]
- @pytest.mark.asyncio(forbid_global_loop=True)
+ @pytest.mark.asyncio()
async def test_script_object(self, r):
await r.script_flush()
await r.set("a", 2)
@@ -97,7 +97,7 @@ class TestScripting:
# Test first evalsha block
assert await multiply(keys=["a"], args=[3]) == 6
- @pytest.mark.asyncio(forbid_global_loop=True)
+ @pytest.mark.asyncio()
async def test_script_object_in_pipeline(self, r):
await r.script_flush()
multiply = r.register_script(multiply_script)
@@ -127,7 +127,7 @@ class TestScripting:
assert await pipe.execute() == [True, b"2", 6]
assert await r.script_exists(multiply.sha) == [True]
- @pytest.mark.asyncio(forbid_global_loop=True)
+ @pytest.mark.asyncio()
async def test_eval_msgpack_pipeline_error_in_lua(self, r):
msgpack_hello = r.register_script(msgpack_hello_script)
assert msgpack_hello.sha

View File

@@ -1,19 +0,0 @@
[pytest]
addopts = -s
markers =
redismod: run only the redis module tests
graph: run only the redisgraph tests
pipeline: pipeline tests
onlycluster: marks tests to be run only with cluster mode redis
onlynoncluster: marks tests to be run only with standalone redis
ssl: marker for only the ssl tests
asyncio: marker for async tests
replica: replica tests
experimental: run only experimental tests
asyncio_mode = auto
timeout = 30
filterwarnings =
always
ignore:RedisGraph support is deprecated as of Redis Stack 7.2:DeprecationWarning
# Ignore a coverage warning when COVERAGE_CORE=sysmon for Pythons < 3.12.
ignore:sys.monitoring isn't available:coverage.exceptions.CoverageWarning

View File

@@ -1,3 +1,100 @@
-------------------------------------------------------------------
Tue Nov 4 21:43:15 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
- Rewrite logic for skipping tests
* Add skipped_tests
* Move list of skipped tests from spec to skipped_tests
* Add list of tests that need to be skipped exclusively for valkey
- Update valkey skipped test list to fix test suite with valkey >= 9.0.0
(bsc#1252957)
- Update general skipped test list with tests that fail in aarch64 and i586
- Add redis_opts rpm macro
* Allows us to properly check for redis/valkey >= 7.0.0, instead of
grepping for known major versions when adding the needed cli options
-------------------------------------------------------------------
Mon Nov 3 03:55:06 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
- Update to 7.0.1: (bsc#1252957)
* New Features
+ Support for maintenance push notifications handling during server
upgrade or maintenance procedures.
+ Adding WITHATTRIBS option to vector set's vsim command.
+ Adding ssl_verify_flags_config argument for ssl connection
configuration
+ Adding new ExternalAuthProviderError that will be raised when we
receive 'problem with LDAP service' response from server.
* Experimental Features
+ Multi-database client implementation
* Breaking changes
+ Adding abstract method declaration for cache property setter in
EvictionPolicyInterface
+ Removing synchronous context manager handling from async RedisCluster.
+ Removing the threading.Lock locks and replacing them with RLock objects
to avoid deadlocks.
+ Adding score_cast_func argument to zrank, zrevrank and zunion - for
consistency with the other sorted sets commands
- Refreshed patch remove-mock.patch
-------------------------------------------------------------------
Tue Sep 30 12:33:11 UTC 2025 - Dirk Müller <dmueller@suse.com>
- update to 6.4.0:
* Added epsilon property to the vsim command
- update to 6.3.0:
* Add support for new BITOP operations: DIFF, DIFF1, ANDOR, ONE
* Support new VAMANA vector index type
* Add new stream commands
* add async Retry __eq__ and __hash__ & fix
ExponentialWithJitterBackoff __eq__
* Fixing sentinel command execution to allow returning of
actual responses when meaningful - behaviour controlled by
'return_responses' argument.
* Annotate deprecated_args decorator to preserve wrapped
function type signature
* Fix ConnectionPool to raise MaxConnectionsError instead of
Connection…
* add async Retry __eq__ and __hash__ & fix
ExponentialWithJitterBackoff __eq__
* SentinelManagedConnection searches for new master upon
connection failure (#3560)
-------------------------------------------------------------------
Mon Jun 30 16:54:24 UTC 2025 - Илья Индиго <ilya@ilya.top>
- Added test_add_elem_no_quant.patch to fix test on 32 bit archs.
-------------------------------------------------------------------
Thu Jun 12 10:24:11 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
- Remove not needed pytest.ini source file.
-------------------------------------------------------------------
Tue Jun 10 16:44:41 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
- Update to 6.2.0:
* https://github.com/redis/redis-py/releases/tag/v6.2.0
* https://github.com/redis/redis-py/releases/tag/v6.1.0
* https://github.com/redis/redis-py/releases/tag/v6.0.0
* https://github.com/redis/redis-py/releases/tag/v5.3.0
- Drop pytest-asyncio-045.patch
* Fixed upstream
- Add remove-mock.patch
* Use built-in unittest.mock
- Don't remove test_graph.py
* The test was dropped upstream
- Add new python-redis-entraid and pytest-mock dependencies for tests
- Add new hatchling build requirement
* Remove setuptools which is no longer needed
- Move test suite to separate flavor to avoid dependency cycle with
python-redis-entraid
* Add _multibuild
* Move some dependencies that were only needed for tests to the new
flavor
- Update skipped test list due to gh#python/cpython#70654
* Skip test_re_auth_pub_sub_in_resp3
* Skip test_do_not_re_auth_pub_sub_in_resp2
-------------------------------------------------------------------
Thu Feb 13 10:59:14 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
@@ -1427,4 +1524,3 @@ Fri Apr 15 12:43:07 UTC 2011 - saschpe@suse.de
Sun Mar 7 22:27:15 UTC 2010 - prusnak@suse.cz
- Created package

View File

@@ -1,7 +1,7 @@
#
# spec file for package python-redis
#
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,34 +16,53 @@
#
%bcond_without testing
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "test"
%define psuffix -test
%bcond_without test
%endif
%if "%{flavor}" == ""
%define psuffix %{nil}
%bcond_with test
%endif
# Add needed cli opts when running redis-server if redis/valkey version >= 7.0.0
%define redis_opts %[v"%(%{_sbindir}/redis-server --version | cut -d " " -f "3" | tr -d "v=")" >= v"7.0.0" ? "--enable-debug-command yes --enable-module-command yes" : ""]
%{?sle15_python_module_pythons}
Name: python-redis
Version: 5.2.1
Name: python-redis%{psuffix}
Version: 7.0.1
Release: 0
Summary: Python client for Redis key-value store
License: MIT
URL: https://github.com/redis/redis-py
Source0: https://files.pythonhosted.org/packages/source/r/redis/redis-%{version}.tar.gz
Source1: https://github.com/redis/redis-py/raw/refs/tags/v%{version}/pytest.ini
# Based on https://github.com/redis/redis-py/blob/master/dockers/sentinel.conf
Source1: sentinel.conf
Source2: skipped_tests
Patch0: increase-test-timeout.patch
# PATCH-FIX-OPENSUSE pytest-asyncio-045.patch
Patch1: pytest-asyncio-045.patch
# PATCH-FIX-UPSTREAM Based on gh#redis/redis-py#3830
Patch1: remove-mock.patch
Patch2: test_add_elem_no_quant.patch
BuildRequires: %{python_module async-timeout >= 4.0.2 if %python-base < 3.11.3}
BuildRequires: %{python_module base >= 3.7}
BuildRequires: %{python_module hatchling}
BuildRequires: %{python_module numpy}
BuildRequires: %{python_module packaging}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module pytest-asyncio}
BuildRequires: %{python_module pytest-timeout}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: psmisc
BuildRequires: python-rpm-macros
%if %{with testing}
%if %{with test}
BuildRequires: %{python_module pybreaker >= 1.4}
BuildRequires: %{python_module pytest-asyncio}
BuildRequires: %{python_module pytest-cov}
BuildRequires: %{python_module pytest-mock}
BuildRequires: %{python_module pytest-timeout}
BuildRequires: %{python_module redis = %{version}}
BuildRequires: %{python_module redis-entraid}
BuildRequires: redis
%endif
Requires: (python-async-timeout >= 4.0.2 if python-base < 3.11.3)
@@ -57,64 +76,53 @@ The Python interface to the Redis key-value store.
%prep
%autosetup -N -n redis-%{version}
# pytest.ini for pytest markers but without coverage
sed /coverage/d %SOURCE1 > pytest.ini
%ifarch s390x
%patch -P 0 -p1
%endif
%patch -P 1 -p2
# These tests pass locally but fail in obs with different
# environment, like ALP build...
rm tests/test_commands.py*
rm tests/test_asyncio/test_commands.py
# The openSUSE redis json, bloom, ts and
# graph are missing in the repos
rm tests/test_bloom.py
rm tests/test_graph.py
rm tests/test_json.py
rm tests/test_timeseries.py
%patch -P 1 -p1
%patch -P 2 -p1
%if %{without test}
%build
%pyproject_wheel
%endif
%if %{without test}
%install
%pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%endif
%if %{with testing}
%if %{with test}
%check
# upstream's tox testsuite starts several servers in docker containers listening on different ports.
# We just start two of them locally
# master
# https://github.com/redis/redis/pull/9920
%{_sbindir}/redis-server --version | grep ' v=[78]\.' && redis7args="--enable-debug-command yes --enable-module-command yes"
%{_sbindir}/redis-server --port 6379 --save "" $redis7args &
%{_sbindir}/redis-server --port 6379 --save "" %redis_opts &
victims="$!"
trap "kill $victims || true" EXIT
sleep 2
# replica
%{_sbindir}/redis-server --port 6380 --save "" --replicaof localhost 6379 &
victims="$victims $!"
# sentinel
cp %{SOURCE1} .
%{_sbindir}/redis-sentinel sentinel.conf &
victims="$victims $!"
trap "kill $victims || true" EXIT
sleep 2
# onlycluster: skip tests which require a full cluster
# redismod: Not available (https://github.com/RedisLabsModules/redismod)
# ssl: no stunnel with certs from docker container, fails at test collection
#
# broken tests in ppc64le
donttest="test_geopos or test_georadius"
# gh#redis/redis-py#2554
donttest="$donttest or test_xautoclaim"
# gh#redis/redis-py#2679
donttest+=" or test_acl_getuser_setuser or test_acl_log"
%pytest -m 'not (onlycluster or redismod or ssl or graph)' -k "not ($donttest)" --ignore tests/test_ssl.py --ignore tests/test_asyncio/test_cluster.py --redis-url=redis://localhost:6379/
# load list of tests to skip from skipped_tests
source %{SOURCE2}
%pytest "${skipped_tests[@]}" $(%{_sbindir}/redis-server --version | grep -q 'Valkey' && echo "${valkey_skipped_tests[@]}") --redis-url=redis://localhost:6379/
%endif
%if %{without test}
%files %{python_files}
%license LICENSE
%doc README.md
%{python_sitelib}/redis/
%{python_sitelib}/redis-%{version}.dist-info
%endif
%changelog

BIN
redis-5.2.1.tar.gz (Stored with Git LFS)

Binary file not shown.

3
redis-7.0.1.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c949df947dca995dc68fdf5a7863950bf6df24f8d6022394585acc98e81624f1
size 4755322

72
remove-mock.patch Normal file
View File

@@ -0,0 +1,72 @@
From fa9c6df7975a7105d265c7e05cc84391060f9478 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Mon, 3 Nov 2025 13:56:52 +1100
Subject: [PATCH] Remove last vestiges of mock.mock
With the minimum Python version now being high enough to drop the usage
of the external mock module, switch to unittest.mock everywhere.
---
dev_requirements.txt | 2 --
tests/test_asyncio/test_credentials.py | 2 +-
tests/test_asyncio/test_multidb/test_healthcheck.py | 3 ++-
tests/test_credentials.py | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
Index: redis-7.0.1/dev_requirements.txt
===================================================================
--- redis-7.0.1.orig/dev_requirements.txt
+++ redis-7.0.1/dev_requirements.txt
@@ -2,8 +2,6 @@ build
build==1.2.2.post1 ; platform_python_implementation == "PyPy" or python_version < "3.10"
click==8.0.4
invoke==2.2.0
-mock
-mock==5.1.0 ; platform_python_implementation == "PyPy" or python_version < "3.10"
packaging>=20.4
packaging==24.2 ; platform_python_implementation == "PyPy" or python_version < "3.10"
Index: redis-7.0.1/tests/test_asyncio/test_credentials.py
===================================================================
--- redis-7.0.1.orig/tests/test_asyncio/test_credentials.py
+++ redis-7.0.1/tests/test_asyncio/test_credentials.py
@@ -4,11 +4,11 @@ import string
from asyncio import Lock as AsyncLock
from asyncio import sleep as async_sleep
from typing import Optional, Tuple, Union
+from unittest.mock import Mock, call
import pytest
import pytest_asyncio
import redis
-from mock.mock import Mock, call
from redis import AuthenticationError, DataError, RedisError, ResponseError
from redis.asyncio import Connection, ConnectionPool, Redis
from redis.asyncio.retry import Retry
Index: redis-7.0.1/tests/test_asyncio/test_multidb/test_healthcheck.py
===================================================================
--- redis-7.0.1.orig/tests/test_asyncio/test_multidb/test_healthcheck.py
+++ redis-7.0.1/tests/test_asyncio/test_multidb/test_healthcheck.py
@@ -1,5 +1,6 @@
+from unittest.mock import AsyncMock, Mock
+
import pytest
-from mock.mock import AsyncMock, Mock
from redis.asyncio.multidb.database import Database
from redis.asyncio.multidb.healthcheck import (
Index: redis-7.0.1/tests/test_credentials.py
===================================================================
--- redis-7.0.1.orig/tests/test_credentials.py
+++ redis-7.0.1/tests/test_credentials.py
@@ -4,10 +4,10 @@ import string
import threading
from time import sleep
from typing import Optional, Tuple, Union
+from unittest.mock import Mock, call
import pytest
import redis
-from mock.mock import Mock, call
from redis import AuthenticationError, DataError, Redis, ResponseError
from redis.auth.err import RequestTokenErr
from redis.backoff import NoBackoff

5
sentinel.conf Normal file
View File

@@ -0,0 +1,5 @@
sentinel resolve-hostnames yes
sentinel monitor redis-py-test localhost 6379 2
sentinel down-after-milliseconds redis-py-test 5000
sentinel failover-timeout redis-py-test 60000
sentinel parallel-syncs redis-py-test 1

55
skipped_tests Normal file
View File

@@ -0,0 +1,55 @@
skipped_tests=(
# onlycluster: skip tests which require a full cluster
# redismod: Not available (https://github.com/RedisLabsModules/redismod)
# ssl: no stunnel with certs from docker container, fails at test collection
-m='not (onlycluster or redismod or ssl)'
# broken tests in ppc64le
--deselect=tests/test_commands.py::TestRedisCommands::test_geopos
--deselect=tests/test_commands.py::TestRedisCommands::test_georadius
# broken in aarch64 and i586
--deselect=tests/test_asyncio/test_commands.py::TestRedisCommands::test_geopos
# broken tests in aarch64
--deselect=tests/test_asyncio/test_commands.py::TestRedisCommands::test_georadius_with
--deselect=tests/test_asyncio/test_commands.py::TestRedisCommands::test_georadius_store_dist
--deselect=tests/test_asyncio/test_commands.py::TestRedisCommands::test_georadiusmember
--deselect=tests/test_commands.py::TestRedisCommands::test_geosearch_member
--deselect=tests/test_commands.py::TestRedisCommands::test_geosearch_with
--deselect=tests/test_commands.py::TestRedisCommands::test_geosearchstore_dist
# gh#redis/redis-py#2554
--deselect=tests/test_commands.py::TestRedisCommands::test_xautoclaim
# gh#python/cpython#70654 -- Fix only present in python313 so disable the tests
--deselect=tests/test_asyncio/test_credentials.py::TestStreamingCredentialProvider::test_re_auth_pub_sub_in_resp3
--deselect=tests/test_asyncio/test_credentials.py::TestStreamingCredentialProvider::test_do_not_re_auth_pub_sub_in_resp2
# gh#redis/redis-py#2679
--deselect=tests/test_commands.py::TestRedisCommands::test_acl_list
# Requires more sentinel services running
--deselect=tests/test_sentinel.py::test_get_sentinels
--deselect=tests/test_sentinel.py::test_get_master_addr_by_name
--deselect=tests/test_asyncio/test_sentinel.py::test_get_sentinels
--deselect=tests/test_asyncio/test_sentinel.py::test_get_master_addr_by_name
# The openSUSE redis json, bloom, ts are missing in the repos
--ignore=tests/test_bloom.py
--ignore=tests/test_json.py
--ignore=tests/test_timeseries.py
# Tests that may require more set up and are ignored in upstream CI pipelines
--ignore=tests/test_scenario
--ignore=tests/test_asyncio/test_scenario
)
valkey_skipped_tests=(
# Tests that pass with redis but fail with valkey for various reasons
--deselect=tests/test_asyncio/test_commands.py::TestRedisCommands::test_readonly_invalid_cluster_state
--deselect=tests/test_asyncio/test_commands.py::TestRedisCommands::test_readonly_invalid_cluster_state
--deselect=tests/test_commands.py::TestRedisCommands::test_lolwut
--deselect=tests/test_commands.py::TestRedisCommands::test_readonly_invalid_cluster_state
--deselect=tests/test_commands.py::TestRedisCommands::test_xgroup_create_entriesread
)

View File

@@ -0,0 +1,24 @@
diff -Pdpru redis-py-6.2.0.orig/tests/test_asyncio/test_vsets.py redis-py-6.2.0/tests/test_asyncio/test_vsets.py
--- redis-py-6.2.0.orig/tests/test_asyncio/test_vsets.py 2025-05-27 19:21:45.000000000 +0300
+++ redis-py-6.2.0/tests/test_asyncio/test_vsets.py 2025-06-30 18:35:24.108629200 +0300
@@ -83,7 +83,7 @@ async def test_add_elem_no_quant(d_clien
assert resp == 1
emb = await d_client.vset().vemb("myset", "elem1")
- assert _validate_quantization(float_array, emb, tolerance=0.0)
+ assert _validate_quantization(float_array, emb, tolerance=0.00001)
@skip_if_server_version_lt("7.9.0")
diff -Pdpru redis-py-6.2.0.orig/tests/test_vsets.py redis-py-6.2.0/tests/test_vsets.py
--- redis-py-6.2.0.orig/tests/test_vsets.py 2025-05-27 19:21:45.000000000 +0300
+++ redis-py-6.2.0/tests/test_vsets.py 2025-06-30 18:35:03.140295444 +0300
@@ -87,7 +87,7 @@ def test_add_elem_no_quant(d_client):
assert resp == 1
emb = d_client.vset().vemb("myset", "elem1")
- assert _validate_quantization(float_array, emb, tolerance=0.0)
+ assert _validate_quantization(float_array, emb, tolerance=0.00001)
@skip_if_server_version_lt("7.9.0")