Accepting request 1190500 from home:darix:apps
- replace with pypi tarball again - Fix filelist - 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 OBS-URL: https://build.opensuse.org/request/show/1190500 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-redis?expand=0&rev=90
This commit is contained in:
Git OBS Bridge
commit
270fc7d402
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
||||
149
Close-various-objects-created-during-asyncio-tests.patch
Normal file
149
Close-various-objects-created-during-asyncio-tests.patch
Normal file
@ -0,0 +1,149 @@
|
||||
From 29d867899ab7abfb0ec2ef73d5bd3a810f8ab432 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Kristj=C3=A1n=20Valur=20J=C3=B3nsson?= <sweskman@gmail.com>
|
||||
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()
|
||||
23
increase-test-timeout.patch
Normal file
23
increase-test-timeout.patch
Normal file
@ -0,0 +1,23 @@
|
||||
Index: redis-5.0.1/tests/test_asyncio/test_lock.py
|
||||
===================================================================
|
||||
--- redis-5.0.1.orig/tests/test_asyncio/test_lock.py
|
||||
+++ redis-5.0.1/tests/test_asyncio/test_lock.py
|
||||
@@ -107,7 +107,7 @@ class TestLock:
|
||||
async def test_blocking_timeout(self, r, event_loop):
|
||||
lock1 = self.get_lock(r, "foo")
|
||||
assert await lock1.acquire(blocking=False)
|
||||
- bt = 0.2
|
||||
+ bt = 0.3
|
||||
sleep = 0.05
|
||||
lock2 = self.get_lock(r, "foo", sleep=sleep, blocking_timeout=bt)
|
||||
start = event_loop.time()
|
||||
Index: redis-5.0.1/pytest.ini
|
||||
===================================================================
|
||||
--- redis-5.0.1.orig/pytest.ini
|
||||
+++ redis-5.0.1/pytest.ini
|
||||
@@ -10,4 +10,4 @@ markers =
|
||||
replica: replica tests
|
||||
experimental: run only experimental tests
|
||||
asyncio_mode = auto
|
||||
-timeout = 30
|
||||
+timeout = 40
|
||||
13
pytest.ini
Normal file
13
pytest.ini
Normal file
@ -0,0 +1,13 @@
|
||||
[pytest]
|
||||
addopts = -s
|
||||
markers =
|
||||
redismod: run only the redis module 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
|
||||
1396
python-redis.changes
Normal file
1396
python-redis.changes
Normal file
File diff suppressed because it is too large
Load Diff
116
python-redis.spec
Normal file
116
python-redis.spec
Normal file
@ -0,0 +1,116 @@
|
||||
#
|
||||
# spec file for package python-redis
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%bcond_without testing
|
||||
|
||||
%{?sle15_python_module_pythons}
|
||||
Name: python-redis
|
||||
Version: 5.0.8
|
||||
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://raw.githubusercontent.com/redis/redis-py/5.0/pytest.ini
|
||||
Patch0: increase-test-timeout.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}
|
||||
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}
|
||||
BuildRequires: redis
|
||||
%endif
|
||||
Requires: python-async-timeout >= 4.0.2
|
||||
Recommends: python-hiredis >= 1.0.0
|
||||
Recommends: redis
|
||||
BuildArch: noarch
|
||||
%python_subpackages
|
||||
|
||||
%description
|
||||
The Python interface to the Redis key-value store.
|
||||
|
||||
%prep
|
||||
%autosetup -N -n redis-%{version}
|
||||
# pytest.ini for pytest markers
|
||||
cp %SOURCE1 .
|
||||
%ifarch s390x
|
||||
%patch -P 0 -p1
|
||||
%endif
|
||||
|
||||
# This test passes locally but fails in obs with different
|
||||
# environment, like ALP build...
|
||||
rm tests/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
|
||||
|
||||
%build
|
||||
%pyproject_wheel
|
||||
|
||||
%install
|
||||
%pyproject_install
|
||||
%python_expand %fdupes %{buildroot}%{$python_sitelib}
|
||||
|
||||
%if %{with testing}
|
||||
%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=7\.' && redis7args="--enable-debug-command yes --enable-module-command yes"
|
||||
%{_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 $!"
|
||||
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)' -k "not ($donttest)" --ignore tests/test_ssl.py --ignore tests/test_asyncio/test_cluster.py --redis-url=redis://localhost:6379/
|
||||
%endif
|
||||
|
||||
%files %{python_files}
|
||||
%license LICENSE
|
||||
%doc README.md
|
||||
%{python_sitelib}/redis/
|
||||
%{python_sitelib}/redis-%{version}*-info
|
||||
|
||||
%changelog
|
||||
BIN
redis-5.0.1.tar.gz
(Stored with Git LFS)
Normal file
BIN
redis-5.0.1.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
3
redis-5.0.8.tar.gz
Normal file
3
redis-5.0.8.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0c5b10d387568dfe0698c6fad6615750c24170e548ca2deac10c649d463e9870
|
||||
size 4595651
|
||||
Loading…
Reference in New Issue
Block a user