Adding metadata

5 files changed, 144 insertions, 201 deletions

diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 3581dc589ed5..2c6a1493a639 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,8 +1,6 @@
-DIST fakeredis-2.34.1.tar.gz 177315 BLAKE2B ed0ca71b7feeeb81cb5bd927eb19a4bc3af56ae1de08334c5825dce88af8197dcc946b8cd3d98ac32972f99c47a480c9669b9fb252e66022ff0dfbe8fce0056f SHA512 26b60db9d4d142cbaaaf51085e4efe44380626c9600145ef4b8254a92eec02423a90b0587817d94c6559f046c7d9adbce1fb25a678d00390be91132de192ece3
-DIST fakeredis-2.34.1.tar.gz.provenance 9528 BLAKE2B bd549cae9bb98f5d85879b38f87d4aed02ebd0b79e858eb273ef94b7c68caec221f684766ad107c445219a792ee9cd61a68791b956b90312ee6160899dbf622f SHA512 d93171e6b50361fc3717461e926d05a4c9773f5381d33c7f5ef8eba6630bb0393cbe9ffa3222f91b375576b457fa431e4037b25a75fcfa39c35b1a25050db899
-DIST fakeredis-2.35.0.tar.gz 189000 BLAKE2B 425fa7663898fd8d3ea8c628c82528fe7654d11daf057daee31c9c35daa643ec557668e127ecd4ca652b40dcd8e5e95af4f235098335b711a4900f30e4fbadc1 SHA512 8ac1876c4d2a01338083c180d8eaa8575faf016770947ff8ad90019117f4e1df88ab4be370f6e1b286c265cc446fdc832fbeb2ae19fd9f6d8aadf217e2f59578
-DIST fakeredis-2.35.0.tar.gz.provenance 9493 BLAKE2B 08f75a47d77f6eb860922dcd23cbd6fff6ed9c659b8f557a2b739049c49713f546af0a5c091ba0aae2d6b86a11808ab19e1a44fbbe6a96c4be795cac2abc629d SHA512 8545733e64c6d996e498c4bff46641a71068c92c8f91aee1a35bd0f06e2020e79db5a4f1dd65c2decaa8a3df253f84913d79b5159c30a30fadcdc58432e1845f
 DIST fakeredis-2.35.1.tar.gz 189118 BLAKE2B 00fcb8ef49091db4dfebe3febcfe8d06a789dac73692a305e62457b944e6567005d27d50b5eb08282be9d5e71615660a2e336a1fd26938d41233db5c41bb2714 SHA512 2a0e25d7319beb6be5647d88d3c675b28011b35b1e48ed545420a17a4707edc552555cf9240d27a4505b26c69cfb3e1e28dc9ff3f78c2471ad18c40a5ed69001
 DIST fakeredis-2.35.1.tar.gz.provenance 9532 BLAKE2B fcf1ca04a303898904d338b7afeeba5731800aad686a7db916091842a9cde6953fd056f6567da3a0b7481c2c127f8e69eea6e672f711ec87cf244480c25ea7f6 SHA512 3e9f6ae3ec809c08110e2b2cad301891c1fd637e0527354f3c81aaa28cef2ea67f2e60103e66cbe78cab7c2d48c28c52a29d82896ba2750d3b159794c271c176
 DIST fakeredis-2.36.0.tar.gz 209484 BLAKE2B a8b29331c923aa0b9194ff1416d2ca59d5f9fd6c75b521c8271fefa4d2699d3d6ee0b65bcf51cf78f0ee6c49cd45ec1c14faaf8b60f03bc99802204515839537 SHA512 f873ee4b711ad994cc714125fc0b0456ba519bc1369ab2a25f3e4be043fc8697532336a1953c1b3d29dfc00fb4618e840b82578a67e6e33cd34f7727273e4fb5
 DIST fakeredis-2.36.0.tar.gz.provenance 9846 BLAKE2B 0441207c408eb0688aaf5b2e51521ea5d3764b2ab8923aac64f9b87c06da566052d7305cc6336e313f9fd9ff8dd3ec414f913027864169272b9ae634e6388231 SHA512 ed5b13ebfd9661a0643d97059baaf5535271e9fab2fd9877af8dd21c1bb28f67e176bc975e78056cc04930bbf81e6db963ea613a54f326b9582ca4b47aade9d6
+DIST fakeredis-2.36.1.tar.gz 210959 BLAKE2B bfbf4d397707a8d5cbb4a94fc4d89b814c4367ef20b894033301b640186ba6846a4102e580be103954fc04f53bb7f1aac0c9976dcfc62f0b9ffac8c5fc6e3405 SHA512 2eaa78273f2a7e1f11d4ccf8937406a81d546671e3bcb70e821ae8f80caf1b38cac908a127c0a7710fc12c50188fe2234b0fea510718fd1f463dcfb5aab1f3d5
+DIST fakeredis-2.36.1.tar.gz.provenance 9944 BLAKE2B f20fb9ad9027e4fd3fae7b37bd9cfaf0112b01c6ac1218506bee74e6aa7f8683d73740e00bd46bba54d0d0b48c266967ec93bf1533c588fe3753afe20c6895f0 SHA512 d2f129e81474f472b5a5437245a176840c935fc4d28e80f90510290c48acd02bbdbcc44a29793b8342a40fead5ba3906542ff6c0837807f5acb7b3d450bca724
diff --git a/dev-python/fakeredis/fakeredis-2.34.1.ebuild b/dev-python/fakeredis/fakeredis-2.34.1.ebuild
deleted file mode 100644
index 0d482e6d5680..000000000000
--- a/dev-python/fakeredis/fakeredis-2.34.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 2020-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYPI_VERIFY_REPO=https://github.com/cunla/fakeredis-py
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/redis-4.3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_PLUGINS=( pytest-{asyncio,mock} )
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis2]"
-	"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis3]"
-	"test/test_mixins/test_pubsub_commands.py::test_published_message_to_shard_channel[StrictRedis3]"
-	test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-	"test/test_mixins/test_pubsub_commands.py::test_pubsub_shardnumsub[StrictRedis2]"
-	"test/test_mixins/test_pubsub_commands.py::test_pubsub_shardnumsub[StrictRedis3]"
-	"test/test_mixins/test_streams_commands.py::test_xgroup_setid_redis7[StrictRedis2]"
-	"test/test_mixins/test_streams_commands.py::test_xgroup_setid_redis7[StrictRedis3]"
-	# json ext
-	test/test_json/test_json.py
-	test/test_json/test_json_arr_commands.py
-	# unknown command 'evalsha'
-	"test/test_asyncredis.py::test_async_lock[fake_resp2]"
-	"test/test_asyncredis.py::test_async_lock[fake_resp3]"
-	# incompatible with xdist, not worth extra effort
-	test/test_tcp_server/test_connectivity.py
-	# flaky
-	test/test_mixins/test_server_commands.py::test_bgsave
-)
-EPYTEST_IGNORE=(
-	# these tests fail a lot...
-	test/test_hypothesis
-	test/test_hypothesis_joint.py
-	# require valkey package
-	test/test_valkey
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# do not install duplicate license
-	sed -i -e '\@fakeredis/LICENSE@d' pyproject.toml || die
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6390
-
-	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
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
-
-python_test() {
-	# we can run "fake" tests in parallel, but "real" seem to share
-	# the same connection
-	epytest -m "not real"
-	EPYTEST_XDIST= epytest -m "real"
-}
diff --git a/dev-python/fakeredis/fakeredis-2.35.0.ebuild b/dev-python/fakeredis/fakeredis-2.35.0.ebuild
deleted file mode 100644
index 01c771cc9b64..000000000000
--- a/dev-python/fakeredis/fakeredis-2.35.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 2020-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYPI_VERIFY_REPO=https://github.com/cunla/fakeredis-py
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/redis-4.3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_PLUGINS=( pytest-{asyncio,mock} )
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis2]"
-	"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis3]"
-	"test/test_mixins/test_pubsub_commands.py::test_published_message_to_shard_channel[StrictRedis3]"
-	test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-	"test/test_mixins/test_pubsub_commands.py::test_pubsub_shardnumsub[StrictRedis2]"
-	"test/test_mixins/test_pubsub_commands.py::test_pubsub_shardnumsub[StrictRedis3]"
-	"test/test_mixins/test_streams_commands.py::test_xgroup_setid_redis7[StrictRedis2]"
-	"test/test_mixins/test_streams_commands.py::test_xgroup_setid_redis7[StrictRedis3]"
-	# json ext
-	test/test_json/test_json.py
-	test/test_json/test_json_arr_commands.py
-	# unknown command 'evalsha'
-	"test/test_asyncredis.py::test_async_lock[fake_resp2]"
-	"test/test_asyncredis.py::test_async_lock[fake_resp3]"
-	# incompatible with xdist, not worth extra effort
-	test/test_tcp_server/test_connectivity.py
-	# flaky
-	test/test_mixins/test_server_commands.py::test_bgsave
-)
-EPYTEST_IGNORE=(
-	# these tests fail a lot...
-	test/test_hypothesis
-	test/test_hypothesis_joint.py
-	# require valkey package
-	test/test_valkey
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# do not install duplicate license
-	sed -i -e '\@fakeredis/LICENSE@d' pyproject.toml || die
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6390
-
-	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
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
-
-python_test() {
-	# we can run "fake" tests in parallel, but "real" seem to share
-	# the same connection
-	epytest -m "not real"
-	EPYTEST_XDIST= epytest -m "real"
-}
diff --git a/dev-python/fakeredis/fakeredis-2.35.1.ebuild b/dev-python/fakeredis/fakeredis-2.35.1.ebuild
index 01c771cc9b64..0d482e6d5680 100644
--- a/dev-python/fakeredis/fakeredis-2.35.1.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.35.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/redis-4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/fakeredis/fakeredis-2.36.1.ebuild b/dev-python/fakeredis/fakeredis-2.36.1.ebuild
new file mode 100644
index 000000000000..ec98dd5020bf
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.36.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYPI_VERIFY_REPO=https://github.com/cunla/fakeredis-py
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/cunla/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/redis-4.3[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-db/valkey
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/valkey[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=( pytest-{asyncio,mock} )
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# do not install duplicate license
+	sed -i -e '\@fakeredis/LICENSE@d' pyproject.toml || die
+}
+
+wait_for_status() {
+	local expected=${1}
+
+	local i
+	for i in {1..50}; do
+		"${server}-cli" -p "${redis_port}" ping
+		[[ ${?} -eq ${expected} ]] && return
+		sleep 0.2
+	done
+
+	die "Timeout while waiting for ${1}-server to start/stop"
+}
+
+src_test() {
+	local server
+	server=fake
+	einfo "Running ${server} server tests"
+	distutils-r1_src_test
+
+	for server in redis valkey; do
+		local redis_pid="${T}/${server}.pid"
+		local redis_port=6390
+		local redis_log="${T}/${server}.log"
+		local redis_db="${T}/${server}.db"
+
+		einfo "Running ${server} server tests"
+		"${EPREFIX}/usr/sbin/${server}-server" - <<- EOF || die "Unable to start ${server} server"
+			daemonize yes
+			pidfile ${redis_pid}
+			port ${redis_port}
+			logfile ${redis_log}
+			dir ${redis_db%/*}
+			dbfilename ${redis_db##*/}
+			bind 127.0.0.1
+		EOF
+
+		# wait for the server to start
+		wait_for_status 0
+
+		distutils-r1_src_test
+
+		"${server}-cli" -p "${redis_port}" shutdown || die "Unable to stop ${server} server"
+
+		# wait for the server to stop
+		wait_for_status 1
+	done
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# json ext
+		test/test_json/test_json.py
+		test/test_json/test_json_arr_commands.py
+		# TODO
+		"test/test_mixins/test_pubsub_commands.py::test_published_message_to_shard_channel[Strict3]"
+		"test/test_mixins/test_pubsub_commands.py::test_pubsub_shardnumsub[Strict2]"
+		"test/test_mixins/test_pubsub_commands.py::test_pubsub_shardnumsub[Strict3]"
+	)
+
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis
+		test/test_hypothesis_joint.py
+	)
+
+	case ${server} in
+		fake)
+			EPYTEST_DESELECT=(
+				# TODO
+				test/test_tcp_server/test_connectivity.py::test_bulk_string_length
+			)
+
+			# every test starts its own server
+			EPYTEST_XDIST= epytest -m "tcp_server"
+			return
+			;;
+		redis)
+			EPYTEST_DESELECT+=(
+				"test/test_mixins/test_set_commands.py::test_smismember_wrong_type[Strict2]"
+				"test/test_mixins/test_set_commands.py::test_smismember_wrong_type[Strict3]"
+
+				"test/test_async/test_redis_only.py::test_async_lock[fake_resp2]"
+				"test/test_async/test_redis_only.py::test_async_lock[fake_resp3]"
+				"test/test_mixins/test_set_commands.py::test_smismember_wrong_type[FakeStrict2]"
+				"test/test_mixins/test_set_commands.py::test_smismember_wrong_type[FakeStrict3]"
+			)
+
+			# run fake tests only once
+			epytest -m "not real and not tcp_server"
+			;;
+	esac
+
+	# we can run "fake" tests in parallel, but "real" seem to share
+	# the same connection
+	EPYTEST_XDIST= epytest -m "real"
+}