commit: 4c97780074b9d1436303fe4e6e1d8185a44cc465 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Jul 5 10:10:10 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Jul 5 10:10:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c977800
dev-python/fakeredis: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/fakeredis/Manifest | 2 - dev-python/fakeredis/fakeredis-2.29.0.ebuild | 89 --------------------- dev-python/fakeredis/fakeredis-2.30.0.ebuild | 91 ---------------------- .../files/fakeredis-2.30.0-pytest-asyncio-1.patch | 59 -------------- 4 files changed, 241 deletions(-) diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest index 77b38e3cb83c..54f4756f6b29 100644 --- a/dev-python/fakeredis/Manifest +++ b/dev-python/fakeredis/Manifest @@ -1,3 +1 @@ -DIST fakeredis-2.29.0.tar.gz 162915 BLAKE2B d2851fefb9fd80d0038bb237d261dbc125035782c1bfcd8d91345a4a2a38423c4972b0803484459baeb09cfd0acaf34559e31fc772cb6e36432068c63027a29a SHA512 721e0f508c6b18413dfeaa5caa1ad12f3b9a63d89f7a535a7dc70f1b69f745f08f26782d73bf681eab578e99504cd14d08b8d639dc6b88b4ae0db5151f3e7b3a -DIST fakeredis-2.30.0.tar.gz 167434 BLAKE2B 7aad6a98edd9dc27e730e54c5f09d230ea9c2ebe1ac6e6c58faefb1dcddf291ae879b68355f6a2b860be68e56a8d92fd343bc9b2f1c0e8c3d4ebbecf3877f24e SHA512 61a5d01cb029495a9095f36a8b459ca289f37600bd1237c8d0055f7fa21f8122e535a7e4cbeabcba3def35e1a638438dc68a63e9c94155962a3f8e5303acb37f DIST fakeredis-2.30.1.tar.gz 167724 BLAKE2B 7ddb8cbdeb4e3c5bcf9e5a6cd854cc55e39298934d097ec2401eb2226a45fa7e4d25ae666a3e34c22ebe75be6be0ad59c7722dbe7e15dac32f7822c5fd54cee7 SHA512 6d23a1e276b2a1ebc1846704f36296ab284b93e978c79358f2e73b6bb0b2c30ea133060dc6e8b9b7c82485c6fccca6efb53f67ecbb468029497e0fd7480dd8db diff --git a/dev-python/fakeredis/fakeredis-2.29.0.ebuild b/dev-python/fakeredis/fakeredis-2.29.0.ebuild deleted file mode 100644 index e9e419d8936a..000000000000 --- a/dev-python/fakeredis/fakeredis-2.29.0.ebuild +++ /dev/null @@ -1,89 +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_11 python3_{11..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-3[${PYTHON_USEDEP}] - >=dev-python/sortedcontainers-2[${PYTHON_USEDEP}] -" -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 - ) - 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.30.0.ebuild b/dev-python/fakeredis/fakeredis-2.30.0.ebuild deleted file mode 100644 index 103b8cdcc4d2..000000000000 --- a/dev-python/fakeredis/fakeredis-2.30.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 2020-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( pypy3_11 python3_{11..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 ~ppc ~ppc64 ~riscv ~sparc ~x86" - -RDEPEND=" - >=dev-python/redis-4.3[${PYTHON_USEDEP}] - <dev-python/sortedcontainers-3[${PYTHON_USEDEP}] - >=dev-python/sortedcontainers-2[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-db/redis - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - ) -" - -# pytest-xdist: tests are not parallel-safe -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - # https://github.com/cunla/fakeredis-py/pull/396 - "${FILESDIR}/${P}-pytest-asyncio-1.patch" - ) - - distutils-r1_src_prepare - - # https://github.com/cunla/fakeredis-py/issues/395 - sed -i -e '/LICENSE/d' pyproject.toml || die -} - -python_test() { - local 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]" - # json ext - test/test_json/test_json.py - test/test_json/test_json_arr_commands.py - ) - local EPYTEST_IGNORE=( - # these tests fail a lot... - test/test_hypothesis - test/test_hypothesis_joint.py - ) - - 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.30.0-pytest-asyncio-1.patch b/dev-python/fakeredis/files/fakeredis-2.30.0-pytest-asyncio-1.patch deleted file mode 100644 index 4dda912a9413..000000000000 --- a/dev-python/fakeredis/files/fakeredis-2.30.0-pytest-asyncio-1.patch +++ /dev/null @@ -1,59 +0,0 @@ -From e057d4307c8e75be2475eca0beec662fa9ea41ff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org> -Date: Wed, 18 Jun 2025 07:46:37 +0200 -Subject: [PATCH] test: Replace deprecated `event_loop` fixture - -Replace the deprecated `event_loop` fixture with an explicit call -to `asyncio.get_running_loop()`, as suggested by the deprecation -warnings: - -``` -test/test_asyncredis.py:61 - test/test_asyncredis.py:61: PytestDeprecationWarning: test_pubsub[fake] is asynchronous and explicitly requests the "event_loop" fixture. Asynchronous fixtures and test functions should use "asyncio.get_running_loop()" instead. - async def test_pubsub(async_redis, event_loop): -``` - -This fixes compatibility with `pytest-asyncio >= 1.0.0`. ---- - test/test_asyncredis.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/test/test_asyncredis.py b/test/test_asyncredis.py -index 47e5f180..a824e962 100644 ---- a/test/test_asyncredis.py -+++ b/test/test_asyncredis.py -@@ -58,7 +58,7 @@ async def test_transaction_fail(async_redis: redis.asyncio.Redis): - await tr.execute() - - --async def test_pubsub(async_redis, event_loop): -+async def test_pubsub(async_redis): - queue = asyncio.Queue() - - async def reader(ps): -@@ -71,7 +71,7 @@ async def reader(ps): - - async with async_timeout(5), async_redis.pubsub() as ps: - await ps.subscribe("channel") -- task = event_loop.create_task(reader(ps)) -+ task = asyncio.get_running_loop().create_task(reader(ps)) - await async_redis.publish("channel", "message1") - await async_redis.publish("channel", "message2") - result1 = await queue.get() -@@ -117,14 +117,14 @@ async def test_blocking_timeout(conn): - - - @pytest.mark.slow --async def test_blocking_unblock(async_redis, conn, event_loop): -+async def test_blocking_unblock(async_redis, conn): - """Blocking command that gets unblocked after some time.""" - - async def unblock(): - await asyncio.sleep(0.1) - await async_redis.rpush("list", "y") - -- task = event_loop.create_task(unblock()) -+ task = asyncio.get_running_loop().create_task(unblock()) - result = await conn.blpop("list", timeout=1) - assert result == (b"list", b"y") - await task