From a9e114042059f000651ff39f26043c90d12b1ee0 Mon Sep 17 00:00:00 2001
From: Volker Wegert <gentoo@volker-wegert.de>
Date: Sat, 3 Dec 2022 05:43:38 +0100
Subject: [PATCH] re-applied changes to dev-python/redis-py

---
 dev-python/redis-py/Manifest              |  2 +
 dev-python/redis-py/redis-py-4.1.4.ebuild | 78 +++++++++++++++++++++++
 dev-python/redis-py/redis-py-4.2.2.ebuild | 78 +++++++++++++++++++++++
 3 files changed, 158 insertions(+)
 create mode 100644 dev-python/redis-py/Manifest
 create mode 100644 dev-python/redis-py/redis-py-4.1.4.ebuild
 create mode 100644 dev-python/redis-py/redis-py-4.2.2.ebuild

diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
new file mode 100644
index 000000000..c4b9b70fc
--- /dev/null
+++ b/dev-python/redis-py/Manifest
@@ -0,0 +1,2 @@
+DIST redis-py-4.1.4.gh.tar.gz 2386325 BLAKE2B ee793611cba0fe60201f655756e131132216c606b8a9cd137e7c9876e29aea969f7ca90a7e9c072d77de5950bf185fcabba0bfe5b43a78b6ebedece81e1e5098 SHA512 9282c18e4937a378b872efa5cdd8b7373f00070eb57aaabbeeeb23a074db180c69f23c03eab53f0bc6a3a2a37c530723bbc3292f4b23bcac086bb560a7f98dc9
+DIST redis-py-4.2.2.gh.tar.gz 2460286 BLAKE2B 67e76226ef35eccad49ba02fb26935917155d1059977dafd20a70c8e6f9dcd1ed3ed6e0ba97f530c2b7c582066f143fdc8afac5a7cf1ee49d278c7a4d678643f SHA512 3d2690b104d36f99db5abc49e80c12f3660aada57ce6a18960bfc5c3aae28e7d05699ea01153c1149568d08370c6a057001ec4838e8010e0a3755fb11642c16b
diff --git a/dev-python/redis-py/redis-py-4.1.4.ebuild b/dev-python/redis-py/redis-py-4.1.4.ebuild
new file mode 100644
index 000000000..aaa702bf4
--- /dev/null
+++ b/dev-python/redis-py/redis-py-4.1.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+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
+		-> ${P}.gh.tar.gz
+"
+
+# This is a copy of the Gentoo main repository ebuild, made because app-forensics/plaso
+# has an upper limit on the redis-py version it supports.
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+
+RDEPEND="
+	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/deprecated-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		<dev-db/redis-7
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Flaky test
+		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
+		# These try to connect to port 6380 and fail for some reason...?
+		tests/test_commands.py::TestRedisCommands::test_sync
+		tests/test_commands.py::TestRedisCommands::test_psync
+	)
+
+	# 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
+
+	# Spawn Redis itself for testing purposes
+	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
+	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	# "${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+	"${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
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/redis-py/redis-py-4.2.2.ebuild b/dev-python/redis-py/redis-py-4.2.2.ebuild
new file mode 100644
index 000000000..aaa702bf4
--- /dev/null
+++ b/dev-python/redis-py/redis-py-4.2.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+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
+		-> ${P}.gh.tar.gz
+"
+
+# This is a copy of the Gentoo main repository ebuild, made because app-forensics/plaso
+# has an upper limit on the redis-py version it supports.
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+
+RDEPEND="
+	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/deprecated-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		<dev-db/redis-7
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Flaky test
+		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
+		# These try to connect to port 6380 and fail for some reason...?
+		tests/test_commands.py::TestRedisCommands::test_sync
+		tests/test_commands.py::TestRedisCommands::test_psync
+	)
+
+	# 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
+
+	# Spawn Redis itself for testing purposes
+	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
+	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	# "${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+	"${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
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}