gentoo resync : 05.12.2021

4 files changed, 11 insertions, 53 deletions

diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 28f7b2cd6ee6..f6a583256e10 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,7 +1,5 @@
-DIST fakeredis-1.5.1.gh.tar.gz 67064 BLAKE2B 6eac029b7de6fb2c9b56a60655b6a224cdcba25fa86662a0423044ab97248984c4c6cfbaacbe4bbb2e3fc6826693791f232c6c55d7f15995d0e5bd00370a9ba8 SHA512 74a238573f9f911e9a39885b52d8c908d51d5620e346b8927c161111ce193566c315999f71d3edb1cb1326970985fd73d533b5483afe0c98ad76798a3c15e242
-DIST fakeredis-1.6.0.gh.tar.gz 70034 BLAKE2B 3e9526bf8a7bdafe2b471f0a9d488f0d654e93666863513444521eefd0ca31dbba7e589431b5dee64b27dbf9c2bcc05c1517f659942aa4491cae42b1d11f45b9 SHA512 7a3aefc161b2396e748b284152e088fc31a49a859259888cf8dcfd3a72045e84079977b0e8f11b571ab00d6c00fcf82dc28a1a50fa75633cf17215553bbd019b
 DIST fakeredis-1.6.1.gh.tar.gz 70171 BLAKE2B f10ac8aaec73871153ac7557a40984e6752b7e3720c1890380bda4aad828003403b6207c5e4f4ace18814e6ad33355acca08ff53cc33cb43acb5d9955ea6e5fc SHA512 1a8718d277d15a887901ed29691af83a2aea57605edf8cf2dbdc00c397a62ea8c1ed21440adadcda431a8ae8f33c85b549c5458a958b1fb74996e54ab612cd13
-EBUILD fakeredis-1.5.1.ebuild 1022 BLAKE2B 14a9cff3b14132348ad22120228ffe9c1e544b9decfd36bff4f239f9e407a98583b4672e0d19d4ab3f33fc4b6c1376bc281347aa0f2de1492a810ba282276682 SHA512 eaeebd6bda2f6f84452e1011a24268d62b9a954e60f4969a8e9081d474b967dd209b4bb7f7335388026c31d6a7de009ade7090d95240e5ddf64b8cf077329544
-EBUILD fakeredis-1.6.0.ebuild 1761 BLAKE2B 5e067b3b19f1a4fb4b5915b6060c3d35e234efcd323e5545641c40b363aca49214da0f99a11e53fff025bb789dbb010dfa0b5f9752e3fc26b9545f55ebc83042 SHA512 a5df13918a26916c1413f4aeeda924639cf618814b5ca362060db33e957c4cf1c7e0cacea0554cf024d70a88b31d4389d2c8e52ab601be4c31284f1357e3a827
-EBUILD fakeredis-1.6.1.ebuild 1716 BLAKE2B e8c2e5c60c69141d1f866323fc1156f4f9441fb675e178b6c71a51fac9ce78d893695bbdee2eb3016648396ee2522e04768a26905a283d863c0a80fd2a9e0f4e SHA512 c1e753943696be5ade1101bbfecf33981b0601266710112bb51aa84a44015c33e000b5434ba0117a28d45200ac14ba85671ba6532a83a9383b8b7f3b80648f85
+DIST fakeredis-1.7.0.gh.tar.gz 71108 BLAKE2B 64b4c8aa2891ac6afd7789e5a8dce4d1a0ccd6a5083b410fd051d871d4ea9748e9d687eb27bbaeea646747f4bf170089d3ef711d6db0d6a88d8b7e755d165b6d SHA512 a8c67929e63196fea45b85097aaf6bf7402679510e471a8d13bdc0f7320e983107416d3e515fa85b1d6a6217fb82dbda7b4425c3c80ac54a1ac50eee875b0fbd
+EBUILD fakeredis-1.6.1.ebuild 1712 BLAKE2B 1d68ddfab20c96fd1a62c778cf028930e8a53c7efdffdbf0a3f3fd031e5da136472c05acdef6f7b7b181e7be70318408a54f947cffb7e144cffaa888a3c7cd61 SHA512 de96c12dbc10635c0bc3b0fa7adac599d64af634f31d6cd30a9b1a35a0f9967a8a4d3f6f6f04e0ada8b19f10a0ef1c906a58240f9eef42a9c31890c0ef57ab07
+EBUILD fakeredis-1.7.0.ebuild 1864 BLAKE2B 29510c5c9864cb02f002f91e3eb5adc522cc400490bb7e5025ab35d49aefbba9c3d3e6b5036426128114e732b08f76ac83153ba39e5a49575c289ed240923947 SHA512 bba47a354064ddfdd103f17d5f5cf4d329824ff22ff02250d10818b14708bc0b8618cd63fef217077b3baead691ef37af65b4fe2b5c1f8e48ca3c6a487b9ed10
 MISC metadata.xml 372 BLAKE2B 7d33e3f97f80538c9bdd35bd71a28b9ed81ad338888dc876635c106d89170d3b6f3a7341ed1be79555f8e8479aa84392353480ca85ff215ea3b4b9cea86cdae2 SHA512 19d9187049c5b597005e3769a2c9a8c26c6f96859c97d13121652a7ca367786107480ccc6eebbeb7896e56bbb02e2012694d4119bc5cf6660e6cda325052977f
diff --git a/dev-python/fakeredis/fakeredis-1.5.1.ebuild b/dev-python/fakeredis/fakeredis-1.5.1.ebuild
deleted file mode 100644
index 2877b6f0adad..000000000000
--- a/dev-python/fakeredis/fakeredis-1.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/jamesls/fakeredis/
-	https://pypi.org/project/fakeredis/"
-SRC_URI="
-	https://github.com/jamesls/fakeredis/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	dev-python/redis-py[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local excludes=(
-		# tests for use with aioredis, not packaged in ::gentoo
-		--ignore test/test_aioredis.py
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-
-	epytest "${excludes[@]}"
-}
diff --git a/dev-python/fakeredis/fakeredis-1.6.1.ebuild b/dev-python/fakeredis/fakeredis-1.6.1.ebuild
index d1542e220ebf..a48bc194340d 100644
--- a/dev-python/fakeredis/fakeredis-1.6.1.ebuild
+++ b/dev-python/fakeredis/fakeredis-1.6.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/redis-py[${PYTHON_USEDEP}]
diff --git a/dev-python/fakeredis/fakeredis-1.6.0.ebuild b/dev-python/fakeredis/fakeredis-1.7.0.ebuild
index 7540d1c5fdec..483759b256f4 100644
--- a/dev-python/fakeredis/fakeredis-1.6.0.ebuild
+++ b/dev-python/fakeredis/fakeredis-1.7.0.ebuild
@@ -27,8 +27,8 @@ BDEPEND="
 	test? (
 		dev-db/redis
 		dev-python/aioredis[${PYTHON_USEDEP}]
-		dev-python/async_generator[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 	)
 "
@@ -44,6 +44,10 @@ EPYTEST_DESELECT=(
 )
 
 python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		"test/test_aioredis2.py::test_failed_script_error[fake]"
+	)
 	local args=(
 		# tests requiring lupa (lua support)
 		-k 'not test_eval and not test_lua and not test_script'
@@ -61,8 +65,8 @@ src_test() {
 		bind 127.0.0.1
 	"
 
-	elog "Spawning Redis"
-	elog "NOTE: Port ${redis_port} must be free"
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
 	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
 
 	# Run the tests