diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest index ffceef8915593..67f874763436a 100644 --- a/dev-python/fakeredis/Manifest +++ b/dev-python/fakeredis/Manifest @@ -1,3 +1 @@ -DIST fakeredis-2.27.0.tar.gz 157510 BLAKE2B aa427ce2bc0880aeea6fcb063cb98ff60caf600cae8b21c902a1d9193dd14d7a5f0daa7a3114c92d8eedeef84c936dba326c68e054a6c1dd775209d9055a88f3 SHA512 2fd33ca8e0a95e381cef5794beb009a20c9cf21c03954e86c56e634f00ea959615dc6021265f76c14236f219ee1bf606fbd43d46ab1db5dc3426b1c610020728 -DIST fakeredis-2.28.0.tar.gz 160940 BLAKE2B 211c86d37f3d0ee2d0afd82bd4e00814cce6ff4fd4580810d3606732d41755521edd4c0447cb4e6912313d141346675e4b8649caec864592e79001549e9220b4 SHA512 5ef685ae964d4687054ecc5fa46dc02709730c0152b38b09382f62a3f0793d3930e4454acbe1d819601247cbb514750360730878013df4b1b96cb78c50195b42 DIST fakeredis-2.28.1.tar.gz 161179 BLAKE2B 6d3699153209c04ad0befceea95a0dbbaf44a97c33aab94424dd4c1904d2813760f1d9efdc41ecc43e3b686b07e19c319918623c7aaa385cb777b6b861969492 SHA512 b48ada482c48965ed6547960e6f806d448200ea88ef2c3ff56463acd13ac9a2223465a1d5e6e8d136cafe9d84e1e4ebcd5d5d9ae34dcc44c4a05e87005b34b8e diff --git a/dev-python/fakeredis/fakeredis-2.27.0.ebuild b/dev-python/fakeredis/fakeredis-2.27.0.ebuild deleted file mode 100644 index 1921f6909742d..0000000000000 --- a/dev-python/fakeredis/fakeredis-2.27.0.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 2020-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} ) - -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 ~ppc ~ppc64 ~riscv ~sparc x86" - -RDEPEND=" - dev-python/packaging[${PYTHON_USEDEP}] - >=dev-python/redis-4.3[${PYTHON_USEDEP}] - =dev-python/sortedcontainers-2[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/typing-extensions[${PYTHON_USEDEP}] - ' 3.10) -" -BDEPEND=" - test? ( - dev-db/redis - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - # https://github.com/cunla/fakeredis-py/pull/363 - "${FILESDIR}/${P}-pypy.patch" - ) - - distutils-r1_src_prepare - - # https://github.com/cunla/fakeredis-py/issues/320 - sed -i -e '/LICENSE/d' pyproject.toml || die -} - -python_test() { - local EPYTEST_DESELECT=( - # also lupa - test/test_aioredis2.py::test_failed_script_error - # TODO - "test/test_fakeredis.py::test_set_get_nx[StrictRedis]" - "test/test_fakeredis.py::test_lpop_count[StrictRedis]" - "test/test_fakeredis.py::test_rpop_count[StrictRedis]" - "test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]" - "test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]" - test/test_mixins/test_set_commands.py::test_smismember_wrong_type - # new redis-server? - "test/test_mixins/test_pubsub_commands.py::test_pubsub_shardnumsub[StrictRedis]" - # json ext - test/test_json/test_json.py - test/test_json/test_json_arr_commands.py - # tdigest ext? - 'test/test_mixins/test_server_commands.py::test_command[FakeStrictRedis]' - # hexpire ext? - 'test/test_mixins/test_acl_commands.py::test_acl_cat[StrictRedis]' - ) - local EPYTEST_IGNORE=( - # these tests fail a lot... - test/test_hypothesis.py - ) - local args=( - # tests requiring lupa (lua support) - -k 'not test_eval and not test_lua and not test_script' - ) - # Note: this package is not xdist-friendly - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p asyncio -p pytest_mock "${args[@]}" -} - -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 -} diff --git a/dev-python/fakeredis/fakeredis-2.28.0.ebuild b/dev-python/fakeredis/fakeredis-2.28.0.ebuild deleted file mode 100644 index c485eaa103b4f..0000000000000 --- a/dev-python/fakeredis/fakeredis-2.28.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 2020-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} ) - -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 ~ppc ~ppc64 ~riscv ~sparc ~x86" - -RDEPEND=" - dev-python/packaging[${PYTHON_USEDEP}] - >=dev-python/redis-4.3[${PYTHON_USEDEP}] - =dev-python/sortedcontainers-2[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/typing-extensions[${PYTHON_USEDEP}] - ' 3.10) -" -BDEPEND=" - test? ( - dev-db/redis - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_test() { - local EPYTEST_DESELECT=( - # also lupa - test/test_aioredis2.py::test_failed_script_error - # TODO - "test/test_fakeredis.py::test_set_get_nx[StrictRedis]" - "test/test_fakeredis.py::test_lpop_count[StrictRedis]" - "test/test_fakeredis.py::test_rpop_count[StrictRedis]" - "test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]" - "test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]" - test/test_mixins/test_set_commands.py::test_smismember_wrong_type - # new redis-server? - "test/test_mixins/test_pubsub_commands.py::test_pubsub_shardnumsub[StrictRedis]" - # json ext - test/test_json/test_json.py - test/test_json/test_json_arr_commands.py - # tdigest ext? - 'test/test_mixins/test_server_commands.py::test_command[FakeStrictRedis]' - # hexpire ext? - 'test/test_mixins/test_acl_commands.py::test_acl_cat[StrictRedis]' - ) - local EPYTEST_IGNORE=( - # these tests fail a lot... - test/test_hypothesis.py - ) - local args=( - # tests requiring lupa (lua support) - -k 'not test_eval and not test_lua and not test_script' - ) - # Note: this package is not xdist-friendly - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p asyncio -p pytest_mock "${args[@]}" -} - -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 -} diff --git a/dev-python/fakeredis/files/fakeredis-2.27.0-pypy.patch b/dev-python/fakeredis/files/fakeredis-2.27.0-pypy.patch deleted file mode 100644 index 72871a55f59f0..0000000000000 --- a/dev-python/fakeredis/files/fakeredis-2.27.0-pypy.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 61fef9d6c144f34654bfaa596678696b0d78d229 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sun, 9 Mar 2025 15:36:45 +0100 -Subject: [PATCH] fix: Fix `test_tcp_server_started` to close the connection - -Fix `test_tcp_server_started` to use a context manager, in order to -close the connection to the `TcpFakeServer` when done. Otherwise, -the test relies on GC closing the connection in order for the server -thread to finish -- which does not happen with PyPy, and causes `pytest` -to hang after running the test suite. ---- - test/test_tcp_server/test_connectivity.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/test/test_tcp_server/test_connectivity.py b/test/test_tcp_server/test_connectivity.py -index 414ed58..9a1f6f1 100644 ---- a/test/test_tcp_server/test_connectivity.py -+++ b/test/test_tcp_server/test_connectivity.py -@@ -17,7 +17,7 @@ def test_tcp_server_started(): - t = Thread(target=server.serve_forever, daemon=True) - t.start() - time.sleep(0.1) -- r = redis.Redis(host=server_address[0], port=server_address[1]) -- r.set("foo", "bar") -- assert r.get("foo") == b"bar" -+ with redis.Redis(host=server_address[0], port=server_address[1]) as r: -+ r.set("foo", "bar") -+ assert r.get("foo") == b"bar" - server.shutdown()