From 7c5ebaf83da4c538dd11b56fdd5dfdf39dcbc096 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Mar 2025 01:49:12 +0000 Subject: gentoo auto-resync : 10:03:2025 - 01:49:12 --- dev-python/fakeredis/Manifest | 3 ++- dev-python/fakeredis/fakeredis-2.27.0.ebuild | 7 +++++- .../fakeredis/files/fakeredis-2.27.0-pypy.patch | 29 ++++++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 dev-python/fakeredis/files/fakeredis-2.27.0-pypy.patch (limited to 'dev-python/fakeredis') diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest index 044ea9798eae..e6d8c2cc9370 100644 --- a/dev-python/fakeredis/Manifest +++ b/dev-python/fakeredis/Manifest @@ -1,3 +1,4 @@ +AUX fakeredis-2.27.0-pypy.patch 1335 BLAKE2B ea19b0ee844de5c5fdf6d143e2b64b3085bdc90e9f94e506244d861f88b0a9bef35b539e0a2c84a222944d75cd561cbf826d4869c5cc0dc805238c4fdfe021f5 SHA512 0b3b2fd37eea2ceacd541030a4bd9966903936c4fab400a906870ea4dfa443b9ce564fc3d81a36d4c7062979412f7bf031bdc4ddf624df6b8c83da1fae74f464 DIST fakeredis-2.27.0.tar.gz 157510 BLAKE2B aa427ce2bc0880aeea6fcb063cb98ff60caf600cae8b21c902a1d9193dd14d7a5f0daa7a3114c92d8eedeef84c936dba326c68e054a6c1dd775209d9055a88f3 SHA512 2fd33ca8e0a95e381cef5794beb009a20c9cf21c03954e86c56e634f00ea959615dc6021265f76c14236f219ee1bf606fbd43d46ab1db5dc3426b1c610020728 -EBUILD fakeredis-2.27.0.ebuild 2647 BLAKE2B 1e792338ef2b5db5e20c4a6c797bccb448d8837c42c9773b0d454d7107ed7e6d9d55d67f792b12c5f8bb2d985c94517715022d91d0d2d77ba041582157ae942b SHA512 a66e5d465a81425326967e85230823b662f42273f61148a49ed472681b00baed42cace0ad313b1ef6595be64fffd5a7e5a16dada16fa69a393b43c34f0aa9f05 +EBUILD fakeredis-2.27.0.ebuild 2760 BLAKE2B a2d99f8cab6a3084240069ea9461c5236ed9c94a8c65ed5e64fd92bf1a335dee9acab52f27b6603cfe5b08ee666cf17815cbce2326f50d6cd03a00d2bdd22fa3 SHA512 37ac5d0fc79e28a10d65d54848c1142a90b5ba12c591b5353d8e9afeae12bcabbf16e93348f2bbde0c03595016298fcad1a452807e8782d86b25c0a6e82f39f8 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5 diff --git a/dev-python/fakeredis/fakeredis-2.27.0.ebuild b/dev-python/fakeredis/fakeredis-2.27.0.ebuild index 9eb948a30eb2..1921f6909742 100644 --- a/dev-python/fakeredis/fakeredis-2.27.0.ebuild +++ b/dev-python/fakeredis/fakeredis-2.27.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( pypy3 python3_{10..13} ) +PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} ) inherit distutils-r1 pypi @@ -38,6 +38,11 @@ BDEPEND=" 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 diff --git a/dev-python/fakeredis/files/fakeredis-2.27.0-pypy.patch b/dev-python/fakeredis/files/fakeredis-2.27.0-pypy.patch new file mode 100644 index 000000000000..72871a55f59f --- /dev/null +++ b/dev-python/fakeredis/files/fakeredis-2.27.0-pypy.patch @@ -0,0 +1,29 @@ +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() -- cgit v1.2.3