gentoo resync : 12.05.2022

4 files changed, 30 insertions, 55 deletions

diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 5cc7d2a3f3be..5cd0d1f8d1f3 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,9 +1,9 @@
 DIST redis-py-4.1.4.tar.gz 2352106 BLAKE2B a7f40d381e3e1d295d2ce88f0adb897704d0065ee7d5bb00108c2c8c67ef649ea63d4ca06dbbe2b21b2f92d70d96f8e2d32a7992ecf702bb4c73589f30c1bae8 SHA512 6dd1bc7622529382901b2fe6e63a5f9d6a4b89175b486c879a63cc8f0e708737431dfe5b834124f0d33f34540ac54813a0e6953bbed3a9dbd226597b4b1cb3ae
-DIST redis-py-4.2.0.tar.gz 2419627 BLAKE2B a4429e17dc90289032c5b98cd482fc6e1349b4b63b2c3f289be1df9d0c667a9f568cbee71d34f88c140fbebf2b0061e9bb3426f1548bccf3c0767c040419251b SHA512 3c4c7f859e63ebadf8d4b01ce14d789caffa18b1f177b6a2269737cb20259dc0165773b1c838c3c08edeea790976183b156f886815b42ea709b4b3a0f2aa3354
-DIST redis-py-4.2.1.tar.gz 2420026 BLAKE2B 2e2ef024dc22ad8447bd0b0c9e2318b5c55568e7a93a73f8f264e5af839d50c7c44d98669d19ddc2a9a6440eaafa8842ebeb749b9b22db83d691dab5421fd774 SHA512 3499126d2c19f599e5bc026c3b66ec99639b2746ef0091ba8bea45cf969d39831e1f2ad47f0ba4c65131d4f248320a8b7d2862c5abb289e46555cd3fc6239674
 DIST redis-py-4.2.2.tar.gz 2421362 BLAKE2B ab59a649e8bc08d706536f994f0462505cea39828072884739b1a6434b45fd120e3b8acb51e8e88ec9fe0ce9acc0bfd6a5ff92bb67080724c7b121ef539af16f SHA512 80673d48cd97af1c5ebc67e919f16891ccb20cd30bc06619ddffeb117ad87f82b73f9b9bda6d36829bc51a35aa3c9b2af7c879ec665cc9664bdd86ac6510095b
+DIST redis-py-4.3.0.gh.tar.gz 4605505 BLAKE2B a7cdf8941f99291f6c6f53e6b11b1cd45fd64d0d96e11848d648964518a970275152c00c3aec3a0342ffc5a4805624344076154d007684ce90137f37df4d90f7 SHA512 881f250f04cd0376d2e617ff07cba3c4f987574d64b0813890310412293c7825bb11a5117b65b27dad05bbdff250f44a736d542ee116034b7a644c6e58f981fd
+DIST redis-py-4.3.1.gh.tar.gz 4605537 BLAKE2B 239dd9be0e6c30dbaeeb609f222802f33e4a4e4a743fe1f348f542fe899b89e47ad9513bf99db713d3cbcb13df0e6593d4631745c3afc3368f8a9e8333b759a8 SHA512 8d38876fbf3593825bf593188a9749bec0f652907f510657e32043ed26fd6d59b1554870f59af65939754500645e4c4c8f15bcb8eab1385a0640c374aa938643
 EBUILD redis-py-4.1.4.ebuild 1918 BLAKE2B c1646652b418e9c7e7e19c086f387f517f0e2f1367e3d93b83c6bb63eae38f376f1cc82d2ad49946f2b51f580e3170487416be43a796bf6f68b1ca2b138cb3af SHA512 9733635fffe6f1334cd371dafa897be7820fdc2e4bf9ffc01ebb563586c27bd84f3f51f15ad49c2790ea83cf6598362aed272cffbb6b50596e0912f3d64578a2
-EBUILD redis-py-4.2.0.ebuild 2200 BLAKE2B 4f827a862840d98e49e27189f630fa3d1cc5dbbd5c90b48b9884ba6b688ece4fc1e727e04cad0bf110a27f03ae5397a547c207544dffb830eee1eb1626ae8149 SHA512 ff10a2bd560af96b6062ec38cdb6b2a87b6522e3d30fa963a08a44c3701d224401ea1a16648ec5ed442a90f43683b05660ad5eb26872c6d14f8f36f639a16920
-EBUILD redis-py-4.2.1.ebuild 2033 BLAKE2B a0ad790fc560b7f9c6f269b4424c31b0ad51238006bfa86427dd023fd935bf8a05b9fd06e6ac17978ed1fde90882c1a5ea080fdea522483fae21f5f02784c822 SHA512 b860888698f10e59e5e38374359c91dffb5646657b9e44db24618353137278a0a5e82fcb641ab8596ef5ec325149050c5b91a3d4842e50bca2502d0a0fbc7f6d
-EBUILD redis-py-4.2.2.ebuild 2079 BLAKE2B 24be762f7de76fdbdc517d971111d35175525f4f7f56909490572e57496590e451b0d636787425c74f67619cb9691ec1840bfa0e6b9d4405a54fe751ceab79dc SHA512 713a7e8c8f602e7675d8fcf24eb3256ea3179d76e5d33ce45b1b1ed1d0960d6caed95484c26b72cb7450d0fdfe2b67ef8eed97770f0e649445bdf7d41c5f7267
+EBUILD redis-py-4.2.2.ebuild 2072 BLAKE2B 10dee545afbf0ca9fc16cb8192297c37087e2fe65b36e46d51ff2c708906c29dbc5042a9c8a8fc5c223bd42f1da6ba3c1c70a6fdd43b26826fa851ced772c77a SHA512 a9995670abcdcd506e03c327e8bb108d63b3580679822da114fd09ff88f7e9e8683d69da2f0520f545ac739589c94a2c806f21ba44ad5db76785f89783b7e092
+EBUILD redis-py-4.3.0.ebuild 1768 BLAKE2B 3fe4517f814c2b988e8cd3b2e365571fcbd83a3acbd3cdbb09333b623f0d33449753732a8fff0225b0eee4968db4c2f35b401fad12c9196fd97e6249a0acecaf SHA512 438f563959b683978b2700e59379b14ad0013bfad75f6f3a43761813faa83563d3da6221e530626e7a7468228c9518dc5cebb4adc4f04f55e16677fb7b88a71a
+EBUILD redis-py-4.3.1.ebuild 1768 BLAKE2B 3fe4517f814c2b988e8cd3b2e365571fcbd83a3acbd3cdbb09333b623f0d33449753732a8fff0225b0eee4968db4c2f35b401fad12c9196fd97e6249a0acecaf SHA512 438f563959b683978b2700e59379b14ad0013bfad75f6f3a43761813faa83563d3da6221e530626e7a7468228c9518dc5cebb4adc4f04f55e16677fb7b88a71a
 MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75
diff --git a/dev-python/redis-py/redis-py-4.2.2.ebuild b/dev-python/redis-py/redis-py-4.2.2.ebuild
index b9f87178642f..8ae3ccbfc5d5 100644
--- a/dev-python/redis-py/redis-py-4.2.2.ebuild
+++ b/dev-python/redis-py/redis-py-4.2.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/async_timeout-4.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/redis-py/redis-py-4.2.1.ebuild b/dev-python/redis-py/redis-py-4.3.0.ebuild
index bdf92ea29be5..9f000b888e29 100644
--- a/dev-python/redis-py/redis-py-4.2.1.ebuild
+++ b/dev-python/redis-py/redis-py-4.3.0.ebuild
@@ -8,13 +8,15 @@ 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}"
+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
+"
 
 LICENSE="MIT"
 SLOT="0"
@@ -27,7 +29,8 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		dev-db/redis
+		<dev-db/redis-7
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
 "
@@ -38,22 +41,10 @@ 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"
+	# TODO: try to run more servers?
+	epytest -m "not redismod and not onlycluster and not replica and not ssl"
 }
 
 src_test() {
diff --git a/dev-python/redis-py/redis-py-4.2.0.ebuild b/dev-python/redis-py/redis-py-4.3.1.ebuild
index e13112f1a58c..9f000b888e29 100644
--- a/dev-python/redis-py/redis-py-4.2.0.ebuild
+++ b/dev-python/redis-py/redis-py-4.3.1.ebuild
@@ -8,13 +8,15 @@ 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}"
+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
+"
 
 LICENSE="MIT"
 SLOT="0"
@@ -27,40 +29,22 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		dev-db/redis
+		<dev-db/redis-7
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
 "
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	# not used by our impls
-	# https://github.com/redis/redis-py/pull/2062
-	sed -i -e '/typing-extensions/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
 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"
+	# TODO: try to run more servers?
+	epytest -m "not redismod and not onlycluster and not replica and not ssl"
 }
 
 src_test() {