From 34cc81e6f04ada374221103cf53ac6fa5901f6c40e9934a7f55eb9d2e125bb43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Dec 2024 12:18:22 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main python-redis revision f6b202a8a564212b5f75efda1906cb43 --- ...objects-created-during-asyncio-tests.patch | 149 ------------------ python-redis.changes | 36 +++++ python-redis.spec | 11 +- redis-5.0.1.tar.gz | 3 - redis-5.1.1.tar.gz | 3 + 5 files changed, 44 insertions(+), 158 deletions(-) delete mode 100644 Close-various-objects-created-during-asyncio-tests.patch delete mode 100644 redis-5.0.1.tar.gz create mode 100644 redis-5.1.1.tar.gz diff --git a/Close-various-objects-created-during-asyncio-tests.patch b/Close-various-objects-created-during-asyncio-tests.patch deleted file mode 100644 index ba4f204..0000000 --- a/Close-various-objects-created-during-asyncio-tests.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 29d867899ab7abfb0ec2ef73d5bd3a810f8ab432 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Kristj=C3=A1n=20Valur=20J=C3=B3nsson?= -Date: Fri, 13 Oct 2023 15:54:23 +0000 -Subject: [PATCH] Close various objects created during asyncio tests - ---- - tests/test_asyncio/test_commands.py | 2 ++ - tests/test_asyncio/test_connect.py | 2 ++ - tests/test_asyncio/test_connection.py | 4 ++++ - tests/test_asyncio/test_retry.py | 3 +++ - tests/test_asyncio/test_sentinel.py | 22 +++++++++---------- - .../test_sentinel_managed_connection.py | 1 + - 6 files changed, 23 insertions(+), 11 deletions(-) - -diff --git a/tests/test_asyncio/test_commands.py b/tests/test_asyncio/test_commands.py -index 9b9852e9ef..35b9f2a29f 100644 ---- a/tests/test_asyncio/test_commands.py -+++ b/tests/test_asyncio/test_commands.py -@@ -370,10 +370,12 @@ async def test_client_setinfo(self, r: redis.Redis): - info = await r2.client_info() - assert info["lib-name"] == "test2" - assert info["lib-ver"] == "1234" -+ await r2.aclose() - r3 = redis.asyncio.Redis(lib_name=None, lib_version=None) - info = await r3.client_info() - assert info["lib-name"] == "" - assert info["lib-ver"] == "" -+ await r3.aclose() - - @skip_if_server_version_lt("2.6.9") - @pytest.mark.onlynoncluster -diff --git a/tests/test_asyncio/test_connect.py b/tests/test_asyncio/test_connect.py -index 0b2d7c2afa..5e6b120fb3 100644 ---- a/tests/test_asyncio/test_connect.py -+++ b/tests/test_asyncio/test_connect.py -@@ -73,6 +73,8 @@ async def _handler(reader, writer): - try: - return await _redis_request_handler(reader, writer, stop_event) - finally: -+ writer.close() -+ await writer.wait_closed() - finished.set() - - if isinstance(server_address, str): -diff --git a/tests/test_asyncio/test_connection.py b/tests/test_asyncio/test_connection.py -index 28e6b0d9c3..9c7f25bf87 100644 ---- a/tests/test_asyncio/test_connection.py -+++ b/tests/test_asyncio/test_connection.py -@@ -85,6 +85,8 @@ async def get_conn(_): - - assert init_call_count == 1 - assert command_call_count == 2 -+ r.connection = None # it was a Mock -+ await r.aclose() - - - @skip_if_server_version_lt("4.0.0") -@@ -143,6 +145,7 @@ async def mock_connect(): - conn._connect.side_effect = mock_connect - await conn.connect() - assert conn._connect.call_count == 3 -+ await conn.disconnect() - - - async def test_connect_without_retry_on_os_error(): -@@ -194,6 +197,7 @@ async def test_connection_parse_response_resume(r: redis.Redis): - pytest.fail("didn't receive a response") - assert response - assert i > 0 -+ await conn.disconnect() - - - @pytest.mark.onlynoncluster -diff --git a/tests/test_asyncio/test_retry.py b/tests/test_asyncio/test_retry.py -index 2912ca786c..8bc71c1479 100644 ---- a/tests/test_asyncio/test_retry.py -+++ b/tests/test_asyncio/test_retry.py -@@ -131,5 +131,8 @@ async def test_get_set_retry_object(self, request): - assert r.get_retry()._retries == new_retry_policy._retries - assert isinstance(r.get_retry()._backoff, ExponentialBackoff) - assert exiting_conn.retry._retries == new_retry_policy._retries -+ await r.connection_pool.release(exiting_conn) - new_conn = await r.connection_pool.get_connection("_") - assert new_conn.retry._retries == new_retry_policy._retries -+ await r.connection_pool.release(new_conn) -+ await r.aclose() -diff --git a/tests/test_asyncio/test_sentinel.py b/tests/test_asyncio/test_sentinel.py -index 25bd7730da..51e59d69d0 100644 ---- a/tests/test_asyncio/test_sentinel.py -+++ b/tests/test_asyncio/test_sentinel.py -@@ -183,13 +183,13 @@ async def test_discover_slaves(cluster, sentinel): - - @pytest.mark.onlynoncluster - async def test_master_for(cluster, sentinel, master_ip): -- master = sentinel.master_for("mymaster", db=9) -- assert await master.ping() -- assert master.connection_pool.master_address == (master_ip, 6379) -+ async with sentinel.master_for("mymaster", db=9) as master: -+ assert await master.ping() -+ assert master.connection_pool.master_address == (master_ip, 6379) - - # Use internal connection check -- master = sentinel.master_for("mymaster", db=9, check_connection=True) -- assert await master.ping() -+ async with sentinel.master_for("mymaster", db=9, check_connection=True) as master: -+ assert await master.ping() - - - @pytest.mark.onlynoncluster -@@ -197,16 +197,16 @@ async def test_slave_for(cluster, sentinel): - cluster.slaves = [ - {"ip": "127.0.0.1", "port": 6379, "is_odown": False, "is_sdown": False} - ] -- slave = sentinel.slave_for("mymaster", db=9) -- assert await slave.ping() -+ async with sentinel.slave_for("mymaster", db=9) as slave: -+ assert await slave.ping() - - - @pytest.mark.onlynoncluster - async def test_slave_for_slave_not_found_error(cluster, sentinel): - cluster.master["is_odown"] = True -- slave = sentinel.slave_for("mymaster", db=9) -- with pytest.raises(SlaveNotFoundError): -- await slave.ping() -+ async with sentinel.slave_for("mymaster", db=9) as slave: -+ with pytest.raises(SlaveNotFoundError): -+ await slave.ping() - - - @pytest.mark.onlynoncluster -@@ -260,7 +260,7 @@ async def mock_disconnect(): - calls += 1 - - with mock.patch.object(pool, "disconnect", mock_disconnect): -- await client.close() -+ await client.aclose() - - assert calls == 1 - await pool.disconnect() -diff --git a/tests/test_asyncio/test_sentinel_managed_connection.py b/tests/test_asyncio/test_sentinel_managed_connection.py -index 711b3ee733..cae4b9581f 100644 ---- a/tests/test_asyncio/test_sentinel_managed_connection.py -+++ b/tests/test_asyncio/test_sentinel_managed_connection.py -@@ -34,3 +34,4 @@ async def mock_connect(): - conn._connect.side_effect = mock_connect - await conn.connect() - assert conn._connect.call_count == 3 -+ await conn.disconnect() diff --git a/python-redis.changes b/python-redis.changes index ef3bc98..5a04e7f 100644 --- a/python-redis.changes +++ b/python-redis.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Mon Oct 7 21:56:28 UTC 2024 - Antonio Teixeira + +- Update to 5.1.1 + https://github.com/redis/redis-py/releases/tag/v5.1.1 + https://github.com/redis/redis-py/releases/tag/v5.1.0 + https://github.com/redis/redis-py/releases/tag/v5.0.9 +- Skip test_asyncio/test_commands.py, fails in OBS but passes locally +- Use --enable-debug-command and --enable-module-command for valkey 8.x.x + +------------------------------------------------------------------- +Tue Jul 30 15:22:51 UTC 2024 - Marcus Rueckert + +- replace with pypi tarball again + +------------------------------------------------------------------- +Tue Jul 30 11:13:47 UTC 2024 - Marcus Rueckert + +- Fix filelist + +------------------------------------------------------------------- +Mon Jul 29 18:55:58 UTC 2024 - Marcus Rueckert + +- Update to 5.0.8 + Required update to support Redis 7.4.0 + https://github.com/redis/redis-py/releases/tag/v5.0.8 + https://github.com/redis/redis-py/releases/tag/v5.0.7 + https://github.com/redis/redis-py/releases/tag/v5.0.6 + https://github.com/redis/redis-py/releases/tag/v5.0.5 + https://github.com/redis/redis-py/releases/tag/v5.0.4 + https://github.com/redis/redis-py/releases/tag/v5.0.3 + https://github.com/redis/redis-py/releases/tag/v5.0.2 +- drop Close-various-objects-created-during-asyncio-tests.patch + included in update +- New BR numpy for the testsuite + ------------------------------------------------------------------- Tue Mar 26 13:46:39 UTC 2024 - John Paul Adrian Glaubitz diff --git a/python-redis.spec b/python-redis.spec index 44cc2e7..cec7000 100644 --- a/python-redis.spec +++ b/python-redis.spec @@ -20,7 +20,7 @@ %{?sle15_python_module_pythons} Name: python-redis -Version: 5.0.1 +Version: 5.1.1 Release: 0 Summary: Python client for Redis key-value store License: MIT @@ -28,10 +28,9 @@ URL: https://github.com/redis/redis-py Source0: https://files.pythonhosted.org/packages/source/r/redis/redis-%{version}.tar.gz Source1: https://raw.githubusercontent.com/redis/redis-py/5.0/pytest.ini Patch0: increase-test-timeout.patch -# PATCH-FIX-UPSTREAM https://github.com/redis/redis-py/pull/3005 -Patch1: Close-various-objects-created-during-asyncio-tests.patch BuildRequires: %{python_module async-timeout >= 4.0.2} BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module numpy} BuildRequires: %{python_module packaging} BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest-asyncio} @@ -61,11 +60,11 @@ cp %SOURCE1 . %ifarch s390x %patch -P 0 -p1 %endif -%patch -P 1 -p1 -# This test passes locally but fails in obs with different +# 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 @@ -86,7 +85,7 @@ 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=7\.' && redis7args="--enable-debug-command yes --enable-module-command yes" +%{_sbindir}/redis-server --version | grep ' v=[78]\.' && redis7args="--enable-debug-command yes --enable-module-command yes" %{_sbindir}/redis-server --port 6379 --save "" $redis7args & victims="$!" trap "kill $victims || true" EXIT diff --git a/redis-5.0.1.tar.gz b/redis-5.0.1.tar.gz deleted file mode 100644 index 13b52c2..0000000 --- a/redis-5.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0dab495cd5753069d3bc650a0dde8a8f9edde16fc5691b689a566eda58100d0f -size 4578353 diff --git a/redis-5.1.1.tar.gz b/redis-5.1.1.tar.gz new file mode 100644 index 0000000..24d8949 --- /dev/null +++ b/redis-5.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6c997521fedbae53387307c5d0bf784d9acc28d9f1d058abeac566ec4dbed72 +size 4607302