gentoo resync : 02.02.2022

4 files changed, 103 insertions, 9 deletions

diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 6d63b9841613..ac013bc71d8f 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,5 +1,7 @@
-DIST redis-py-4.0.2.tar.gz 2262717 BLAKE2B 7db99843b4ee354b0841de1cacca001901b0614868e6cd545edb0f3705b7dc7d7a0ee755e2184ec1fb080a845a2f193ff5ab5a4dd99006eed6b9a1c89fbee131 SHA512 3f73ddd2ceb551fa447cfb4ecdc1d393957bbfd8c184ae3d357f9f47fff860f1c4684ec0fc3cb85fea530454456c17a98a2a56e592bef4cd9ad17bb405c1a0f7
 DIST redis-py-4.1.0.tar.gz 2346542 BLAKE2B 3d59f904f376df7bca14dcd7bc8547d7a7b41b8d934a50ade6dbf5e74f3da8deef59b3b7cf683fe3c7389859f76fe1d3307f91b52250da945f91b90c629640ab SHA512 85cd09570f4faf34a735befd0677aa8ca2cb0d62b0285c4c040380c2440f2774e47762ec4219381294465343353a15804b96f06b4d6eefa7159a224eb9e72001
-EBUILD redis-py-4.0.2.ebuild 1431 BLAKE2B bcc4ee55d90faddb457a90ee849d21c715152a1f1d214dfb663395772ced34405e15c2c873dac437e6f9def958032db62a947d502bdf9e38ac0ea5b7d9716f4b SHA512 82f07bab5e1dbbf43eeeeafe1e56c2eddf1200069d4896c59ea9dda914822376ffe29dff154d9991002a83c77b6dd85a476aa99350713c20f33f341fb88131c2
-EBUILD redis-py-4.1.0.ebuild 1856 BLAKE2B ce2d4ac357ea507cf0d95ad26ef7930b4f4aae4a8d3ffdd5397147e7b8adbf2335624f7c3a5fbcc2541fa759908b309a801e2e361599f23b81701ac087c7241c SHA512 4405a49fc86134c35752e4897a2af01794c91c383794319648fd1bcafde02296c88709dc825aaf77f959339b0562bebffa46e130bdb274ebb028851ff6243c12
+DIST redis-py-4.1.1.tar.gz 2349319 BLAKE2B adebda19239e1fd4cf685c0de7a9b2c2fc4e8f23df0e80f2ecdf5f4b9b8b2698fbab613975bd380ea74dc275710d8ed58ee0720486c079bf554612cb7d8b392e SHA512 a974a910dcbaf75516e311badbe6e019cdce668a6d8cd918503934bb92bf97f7ea373fae32139f89a9eecdb360184ae42d24d742ef8b008e95eae648bd992e64
+DIST redis-py-4.1.2.tar.gz 2349862 BLAKE2B 3e68918654e63c3403f2408350b2a877027a3c3990b623818332e0e77e1fbaa413e85912ea586a90788a87e0206ebe408ab55df522864dc534907c31a690c0c1 SHA512 beb6e50051eae61e84e7cf37f9f3e3efbc404d49e506b0b3bdae0d0c45fd940f12c801434a6394505519bf327b5933c076ad4f8c66ad812441bc08b3aa682542
+EBUILD redis-py-4.1.0.ebuild 1849 BLAKE2B 15f46305c094223bfb38129d85efa894ed9af4175e2eb17d14fbd423a50fe4549eebdd2a3138f3cb438be3299208eb377ffcfd4942e5d97b19d76db9a34c64a9 SHA512 d3f7af41e185f65b798f105dae482d0c9b83036c3f342faa03df0cba6d569dc1ccb6feb4b1016bab8f5b9286daf2d3e3adee0cd0063edc44d6ff8228c88be609
+EBUILD redis-py-4.1.1.ebuild 1856 BLAKE2B e22c6444d7aca15986e964da47db735958b1f27a077ba4fb737af6ba2b0254b15aa1a224bf8037ebb882f52fecc253666b74418f4139534bc525861e1afe5261 SHA512 3c7ffae06db0e0a59210c478c6bad470d4272189b9def240049c8f1f77b6525df082bfe77f9da46ac4fd96aa2f753b7496ffb9e56c1ad919a6b6896a68196b64
+EBUILD redis-py-4.1.2.ebuild 1917 BLAKE2B 8f069e093b2e2bbb4fac962e4e98fafe8458f9237fd16143236678bb07a11f03303bfa326b0ebdf1eb69efeef14569c2f8edf6f1b406f2243dc847e9296a56e4 SHA512 b3aee1256e96dede9f44bf4dd568df2fa6fe8b8df94581a91ed4b5d32efce9d01da7cc001583505d54e52f1ae8920f7a9d114803a5e81b6d067974a8dbe9c626
 MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75
diff --git a/dev-python/redis-py/redis-py-4.1.0.ebuild b/dev-python/redis-py/redis-py-4.1.0.ebuild
index b2304d31625f..41ddbc63a286 100644
--- a/dev-python/redis-py/redis-py-4.1.0.ebuild
+++ b/dev-python/redis-py/redis-py-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/deprecated[${PYTHON_USEDEP}]"
diff --git a/dev-python/redis-py/redis-py-4.0.2.ebuild b/dev-python/redis-py/redis-py-4.1.1.ebuild
index fac315489b31..f0d7b85ac0f9 100644
--- a/dev-python/redis-py/redis-py-4.0.2.ebuild
+++ b/dev-python/redis-py/redis-py-4.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/deprecated[${PYTHON_USEDEP}]"
@@ -30,12 +30,27 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_test() {
+	distutils_install_for_testing
+
 	local EPYTEST_DESELECT=(
-		# flaky test
+		# Flaky test
 		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
+
+		# Needs a second Redis running
+		tests/test_commands.py::TestRedisCommands::test_sync
+		tests/test_commands.py::TestRedisCommands::test_psync
+	)
+
+	local EPYTEST_IGNORE=(
+		# SSL tests need Docker/stunnel:
+		# https://github.com/redis/redis-py/commit/18c6809b761bc6755349e1d7e08e74e857ec2c65
+		tests/test_ssl.py
+
+		# Needs multiple Redises running
+		tests/test_cluster.py
 	)
 
-	epytest -k "not redismod"
+	epytest -k "not redismod and not ssl"
 }
 
 src_test() {
diff --git a/dev-python/redis-py/redis-py-4.1.2.ebuild b/dev-python/redis-py/redis-py-4.1.2.ebuild
new file mode 100644
index 000000000000..9f99d80d3b5d
--- /dev/null
+++ b/dev-python/redis-py/redis-py-4.1.2.ebuild
@@ -0,0 +1,77 @@
+# 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..10} pypy3 )
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/redis/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/deprecated[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-db/redis
+		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
+
+		# Needs a second Redis running
+		tests/test_commands.py::TestRedisCommands::test_sync
+		tests/test_commands.py::TestRedisCommands::test_psync
+	)
+
+	local EPYTEST_IGNORE=(
+		# SSL tests need Docker/stunnel:
+		# https://github.com/redis/redis-py/commit/18c6809b761bc6755349e1d7e08e74e857ec2c65
+		tests/test_ssl.py
+
+		# Needs multiple Redises running
+		tests/test_cluster.py
+	)
+
+	epytest -k "not redismod 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
+}