From 2922f1d7e5a5e3ee982a1695b4e170f9025fe77b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Wed, 14 May 2025 06:44:01 +0200
Subject: [PATCH] dev-python/redis: Bump to 6.1.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-python/redis/Manifest           |   1 +
 dev-python/redis/redis-6.1.0.ebuild | 109 ++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 dev-python/redis/redis-6.1.0.ebuild

diff --git a/dev-python/redis/Manifest b/dev-python/redis/Manifest
index 17090f64b526f..e2508745f10b5 100644
--- a/dev-python/redis/Manifest
+++ b/dev-python/redis/Manifest
@@ -1,2 +1,3 @@
 DIST redis-py-5.2.1.gh.tar.gz 4824044 BLAKE2B 9adf1b7093d7e562782f0c17c9134f33326b19f6ae9895142eadf251165c7d8bed7e61eedc96360724602b42cde4e1f9a0a4193fa76a3de2e30b95268a2f5e2b SHA512 583495712b492558fa186a0b72f19576418fc49937e4e2c2716335f3b05f5c5da6dda149abe6a55ef1dc93284660348a5d545a69db0a1dde08218305f44e9f52
 DIST redis-py-6.0.0.gh.tar.gz 4853361 BLAKE2B a82f2c9d05c62c2e4fc310923d78ad9164c3fa4886f046f15261a97d843ff4478f7bd5ed283739424bcc9fe378265afaf00448aa954e537fecf0f1a3947d9f6e SHA512 72c91bc132dcc9cc32ed221b931c6315615dac9e4b1054638df6ed651f0ba787c319d59c22a001962efca40efcf73654ff012007cda4b277783cb2fa6a9cb9d6
+DIST redis-py-6.1.0.gh.tar.gz 4865160 BLAKE2B 27959cf88b9cb4600b952408b895c3da02c3c6a11bd33182582e4565003cbfdb8a63e567c7fc7ed97581c6926c62594a0fc57c7a6176544026f34a78cd0767c6 SHA512 aacb02565d1b1b672135caffdd29ad83f688184e8f7ba2835668b8ea938e158dc09e9cdf1f6313ffedff86e07da0d18ceed2fcfa5ef677d3ed0c7ff4418d1f39
diff --git a/dev-python/redis/redis-6.1.0.ebuild b/dev-python/redis/redis-6.1.0.ebuild
new file mode 100644
index 0000000000000..141fc230173bf
--- /dev/null
+++ b/dev-python/redis/redis-6.1.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{11..13} pypy3_11 )
+
+inherit distutils-r1
+
+MY_P=redis-py-${PV}
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="
+	https://github.com/redis/redis-py/
+	https://pypi.org/project/redis/
+"
+SRC_URI="
+	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# https://github.com/redis/redis-py/issues/3339
+	sed -i 's:(forbid_global_loop=True)::' tests/test_asyncio/*.py || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Flaky test
+		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
+		# require extra redis modules that apparently aren't packaged
+		# on Gentoo
+		tests/{,test_asyncio/}test_bloom.py
+		tests/{,test_asyncio/}test_graph.py
+		tests/{,test_asyncio/}test_json.py
+		tests/{,test_asyncio/}test_timeseries.py
+		# apparently available only in "Redis Stack 7.2 RC3 or later"
+		tests/test_commands.py::TestRedisCommands::test_tfunction_load_delete
+		tests/test_commands.py::TestRedisCommands::test_tfunction_list
+		tests/test_commands.py::TestRedisCommands::test_tfcall
+		# TODO
+		tests/test_commands.py::TestRedisCommands::test_module
+		tests/test_commands.py::TestRedisCommands::test_module_loadex
+		tests/test_commands.py::TestRedisCommands::test_zrank_withscore
+		tests/test_commands.py::TestRedisCommands::test_zrevrank_withscore
+		tests/test_commands.py::TestRedisCommands::test_xinfo_consumers
+		tests/test_asyncio/test_commands.py::TestRedisCommands::test_zrank_withscore
+		tests/test_asyncio/test_commands.py::TestRedisCommands::test_zrevrank_withscore
+		tests/test_asyncio/test_commands.py::TestRedisCommands::test_xinfo_consumers
+		tests/test_asyncio/test_pubsub.py::TestPubSubAutoReconnect::test_reconnect_socket_error[pool-hiredis-listen]
+	)
+	local EPYTEST_IGNORE=(
+		# fails over missing certs, we don't do cluster anyway
+		tests/test_asyncio/test_cluster.py
+		# require redis_entraid
+		tests/test_asyncio/test_credentials.py
+		tests/test_credentials.py
+	)
+
+	# TODO: try to run more servers?
+	epytest -m "not redismod and not onlycluster and not replica and not ssl"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	if has_version ">=dev-db/redis-7"; then
+		local extra_conf="
+			enable-debug-command yes
+			enable-module-command yes
+		"
+	fi
+
+	# Spawn Redis itself for testing purposes
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1 ::1
+		${extra_conf}
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}