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

python-redis.changes

@@ -1,3 +1,64 @@
+-------------------------------------------------------------------
+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>
 

python-redis.spec

@@ -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
@@ -27,15 +27,22 @@
 %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%{psuffix}
-Version:        6.2.0
+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
+# 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-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}
@@ -49,6 +56,7 @@ BuildRequires:  fdupes
 BuildRequires:  psmisc
 BuildRequires:  python-rpm-macros
 %if %{with test}
+BuildRequires:  %{python_module pybreaker >= 1.4}
 BuildRequires:  %{python_module pytest-asyncio}
 BuildRequires:  %{python_module pytest-cov}
 BuildRequires:  %{python_module pytest-mock}
@@ -74,16 +82,6 @@ The Python interface to the Redis key-value store.
 %patch -P 1 -p1
 %patch -P 2 -p1
 
-# 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
-# are missing in the repos
-rm tests/test_bloom.py
-rm tests/test_json.py
-rm tests/test_timeseries.py
-
 %if %{without test}
 %build
 %pyproject_wheel
@@ -101,29 +99,22 @@ rm tests/test_timeseries.py
 # 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 "" %redis_opts &
-%{_sbindir}/redis-server --port 6379 --save "" $redis7args &
 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)
+# load list of tests to skip from skipped_tests
-# ssl: no stunnel with certs from docker container, fails at test collection
+source %{SOURCE2}
-#
+
-# broken tests in ppc64le
+%pytest "${skipped_tests[@]}" $(%{_sbindir}/redis-server --version | grep -q 'Valkey' && echo "${valkey_skipped_tests[@]}") --redis-url=redis://localhost:6379/
-donttest="test_geopos or test_georadius"
-# gh#redis/redis-py#2554
-donttest="$donttest or test_xautoclaim"
-# gh#python/cpython#70654 -- Fix only present in python313 so disable the tests
-donttest+=" or test_re_auth_pub_sub_in_resp3 or test_do_not_re_auth_pub_sub_in_resp2"
-# 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/
 %endif
 
 %if %{without test}

redis-6.2.0.tar.gz

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

redis-7.0.1.tar.gz

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

remove-mock.patch

@@ -1,26 +1,72 @@
-Index: b/tests/test_asyncio/test_credentials.py
+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
 ===================================================================
---- a/tests/test_asyncio/test_credentials.py
+--- redis-7.0.1.orig/dev_requirements.txt
-+++ b/tests/test_asyncio/test_credentials.py
++++ redis-7.0.1/dev_requirements.txt
-@@ -8,7 +8,7 @@ from typing import Optional, Tuple, Unio
+@@ -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 unittest.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: b/tests/test_credentials.py
+Index: redis-7.0.1/tests/test_asyncio/test_multidb/test_healthcheck.py
 ===================================================================
---- a/tests/test_credentials.py
+--- redis-7.0.1.orig/tests/test_asyncio/test_multidb/test_healthcheck.py
-+++ b/tests/test_credentials.py
++++ redis-7.0.1/tests/test_asyncio/test_multidb/test_healthcheck.py
-@@ -7,7 +7,7 @@ from typing import Optional, Tuple, Unio
+@@ -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 unittest.mock import Mock, call
  from redis import AuthenticationError, DataError, Redis, ResponseError
  from redis.auth.err import RequestTokenErr
  from redis.backoff import NoBackoff

sentinel.conf

@@ -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

skipped_tests

@@ -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
+)