From 81f6c2c8b24bd0e762676be3b9ee3f679b41cbf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 2 Sep 2025 14:37:49 +0200 Subject: [PATCH] dev-python/aiohappyeyeballs: Backport pytest-asyncio-1 fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/960902 Signed-off-by: Michał Górny --- .../aiohappyeyeballs-2.6.1.ebuild | 12 ++++---- ...happyeyeballs-2.6.1-pytest-asyncio-1.patch | 30 +++++++++++++++++++ 2 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 dev-python/aiohappyeyeballs/files/aiohappyeyeballs-2.6.1-pytest-asyncio-1.patch diff --git a/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.6.1.ebuild b/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.6.1.ebuild index 015e96b701d75..41124577f9fa4 100644 --- a/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.6.1.ebuild +++ b/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.6.1.ebuild @@ -24,14 +24,16 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc BDEPEND=" >=dev-python/poetry-core-2.0.0[${PYTHON_USEDEP}] - test? ( - >=dev-python/pytest-asyncio-0.23.2[${PYTHON_USEDEP}] - ) " +EPYTEST_PLUGINS=( pytest-asyncio ) distutils_enable_tests pytest +PATCHES=( + # https://github.com/aio-libs/aiohappyeyeballs/pull/181 + "${FILESDIR}/${P}-pytest-asyncio-1.patch" +) + python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p asyncio -o addopts= + epytest -o addopts= } diff --git a/dev-python/aiohappyeyeballs/files/aiohappyeyeballs-2.6.1-pytest-asyncio-1.patch b/dev-python/aiohappyeyeballs/files/aiohappyeyeballs-2.6.1-pytest-asyncio-1.patch new file mode 100644 index 0000000000000..d5750359157a2 --- /dev/null +++ b/dev-python/aiohappyeyeballs/files/aiohappyeyeballs-2.6.1-pytest-asyncio-1.patch @@ -0,0 +1,30 @@ +From 5f94f4bdc4f7b4b533d6517308a3d33a1a64e3cc Mon Sep 17 00:00:00 2001 +From: "J. Nick Koston" +Date: Sun, 24 Aug 2025 01:18:33 -0500 +Subject: [PATCH] chore: updates for pytest-asyncio + +--- + tests/conftest.py | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/tests/conftest.py b/tests/conftest.py +index 6db53d2..9f7a4cb 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -41,10 +41,13 @@ def long_repr_strings() -> Generator[None, None, None]: + + + @pytest.fixture(autouse=True) +-def verify_no_lingering_tasks( +- event_loop: asyncio.AbstractEventLoop, +-) -> Generator[None, None, None]: ++def verify_no_lingering_tasks() -> Generator[None, None, None]: + """Verify that all tasks are cleaned up.""" ++ try: ++ event_loop = asyncio.get_event_loop() ++ except RuntimeError: ++ yield ++ return + tasks_before = asyncio.all_tasks(event_loop) + yield +