diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest index 33a08706f84f6..4977f31d9d375 100644 --- a/dev-python/anyio/Manifest +++ b/dev-python/anyio/Manifest @@ -1,2 +1,3 @@ DIST anyio-3.1.0.tar.gz 122097 BLAKE2B 4a16a5d231cc5262dd4138f628b9d210180733bda4b9e81ced0c0e0c7f49e1760c8dd22db0a1db3b7a21f3210072f4e1c543e52a7dc716ad3f0415827da48e38 SHA512 120d8e3e24f542c06caedd0a67d16b3fb69c94f5feaebde5262e54f8ffba3f1cf927c82030d65fa2efb3479ee64abd968b6ce67aee767ea33ccef6b0e3fbd358 DIST anyio-3.2.0.tar.gz 126210 BLAKE2B cedace636a115ad579ca47b345bb2a9bb32e97fa2ef886a9e6bd19219dcc92c393aaaf480df5e6f48c959590c2d6a3e0770f700ab4901c7a8e576b231597abf1 SHA512 f4e718704225d9cbb8e2592246ac393f96e82fb1898bc0ff89b2d7990c4aac7e7c9b339cb57a594c59a9e5730696122c9e647310c26e00ab152879e0a7e85863 +DIST anyio-3.2.1.tar.gz 126277 BLAKE2B 510980c9251081d5188f7654279753051cd9f8221f2090fb99624612e48b6f5fc1f6d9f1808f1c329c350857f14ceaee0d72615857171de33dc35cc7ba35ab23 SHA512 ef78e5531a917e3a5ddc1106f45ba556ca147e52ab29ed6cb25a3bd287148a15a015942dde6b9535d683fbe5910affed27df6ce5c4049251610f689cd151ee89 diff --git a/dev-python/anyio/anyio-3.2.1.ebuild b/dev-python/anyio/anyio-3.2.1.ebuild new file mode 100644 index 0000000000000..7727ceecc6144 --- /dev/null +++ b/dev-python/anyio/anyio-3.2.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..9} ) + +inherit distutils-r1 + +DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations" +HOMEPAGE=" + https://github.com/agronholm/anyio + https://pypi.org/project/anyio/ +" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm" + +RDEPEND=" + >=dev-python/idna-2.8[${PYTHON_USEDEP}] + >=dev-python/sniffio-1.1[${PYTHON_USEDEP}] +" + +BDEPEND=" + test? ( + >=dev-python/hypothesis-4.0[${PYTHON_USEDEP}] + >=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}] + dev-python/trustme[${PYTHON_USEDEP}] + >=dev-python/uvloop-0.15[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests --install pytest +distutils_enable_sphinx docs \ + dev-python/sphinx_rtd_theme \ + dev-python/sphinx-autodoc-typehints + +PATCHES=( + "${FILESDIR}"/${P}-missing-trio.patch +) + +python_test() { + distutils_install_for_testing + epytest -Wdefault -m 'not network' -p no:django +} diff --git a/dev-python/anyio/files/anyio-3.2.1-missing-trio.patch b/dev-python/anyio/files/anyio-3.2.1-missing-trio.patch new file mode 100644 index 0000000000000..492fe40fe70e0 --- /dev/null +++ b/dev-python/anyio/files/anyio-3.2.1-missing-trio.patch @@ -0,0 +1,125 @@ +From d05f92bddc4b34a8d527f66d5d27513cd91c741a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Thu, 24 Jun 2021 09:16:01 +0200 +Subject: [PATCH] Handle missing trio gracefully + +Make it possible to use anyio without actually having to install trio. +This involves modifying get_all_backends() to only return the backends +that are actually present, and teaching the tests to skip trio if it +is not importable. +--- + src/anyio/_core/_eventloop.py | 13 +++++++++---- + tests/conftest.py | 9 ++++++++- + tests/test_pytest_plugin.py | 2 +- + tests/test_taskgroups.py | 10 ++++++++-- + 4 files changed, 26 insertions(+), 8 deletions(-) + +diff --git a/src/anyio/_core/_eventloop.py b/src/anyio/_core/_eventloop.py +index f2364a3..431a922 100644 +--- a/src/anyio/_core/_eventloop.py ++++ b/src/anyio/_core/_eventloop.py +@@ -10,8 +10,6 @@ import sniffio + # This must be updated when new backends are introduced + from ._compat import DeprecatedAwaitableFloat + +-BACKENDS = 'asyncio', 'trio' +- + T_Retval = TypeVar('T_Retval') + threadlocals = threading.local() + +@@ -106,8 +104,15 @@ def current_time() -> DeprecatedAwaitableFloat: + + + def get_all_backends() -> Tuple[str, ...]: +- """Return a tuple of the names of all built-in backends.""" +- return BACKENDS ++ """Return a tuple of the names of all available built-in backends.""" ++ backends = ['asyncio'] ++ try: ++ import trio ++ except ImportError: ++ pass ++ else: ++ backends.append(trio) ++ return tuple(backends) + + + def get_cancelled_exc_class() -> Type[BaseException]: +diff --git a/tests/conftest.py b/tests/conftest.py +index f040ac8..5834395 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -8,6 +8,11 @@ import trustme + from _pytest.fixtures import SubRequest + from trustme import CA + ++try: ++ import trio ++except ImportError: ++ trio = None ++ + uvloop_marks = [] + uvloop_policy = None + try: +@@ -30,7 +35,9 @@ pytest_plugins = ['pytester'] + id='asyncio'), + pytest.param(('asyncio', {'debug': True, 'policy': uvloop_policy}), marks=uvloop_marks, + id='asyncio+uvloop'), +- pytest.param('trio') ++ pytest.param('trio', ++ marks=[pytest.mark.skipif(trio is None, ++ reason='trio is not available')]) + ]) + def anyio_backend(request: SubRequest) -> Tuple[str, Dict[str, Any]]: + return request.param +diff --git a/tests/test_pytest_plugin.py b/tests/test_pytest_plugin.py +index bb254a5..d55d511 100644 +--- a/tests/test_pytest_plugin.py ++++ b/tests/test_pytest_plugin.py +@@ -135,7 +135,7 @@ def test_asyncio(testdir: Testdir) -> None: + ) + + result = testdir.runpytest('-v') +- result.assert_outcomes(passed=2, failed=1, errors=2) ++ result.assert_outcomes(passed=2, failed=1, errors=len(get_all_backends())) + + + def test_autouse_async_fixture(testdir: Testdir) -> None: +diff --git a/tests/test_taskgroups.py b/tests/test_taskgroups.py +index 62a2389..47971c0 100644 +--- a/tests/test_taskgroups.py ++++ b/tests/test_taskgroups.py +@@ -5,7 +5,6 @@ import time + from typing import Any, AsyncGenerator, Coroutine, Dict, Generator, NoReturn, Set + + import pytest +-import trio + + import anyio + from anyio import ( +@@ -13,6 +12,11 @@ from anyio import ( + fail_after, get_cancelled_exc_class, move_on_after, sleep, wait_all_tasks_blocked) + from anyio.abc import TaskGroup, TaskStatus + ++try: ++ import trio ++except ImportError: ++ trio = None ++ + if sys.version_info < (3, 7): + current_task = asyncio.Task.current_task + else: +@@ -53,7 +57,9 @@ async def test_success() -> None: + + @pytest.mark.parametrize('module', [ + pytest.param(asyncio, id='asyncio'), +- pytest.param(trio, id='trio') ++ pytest.param(trio, id='trio', ++ marks=[pytest.mark.skipif(trio is None, ++ reason='trio is not available')]) + ]) + def test_run_natively(module: Any) -> None: + async def testfunc() -> None: +-- +2.32.0 +