From 7c1b1e277d01420db29b7fedea9dcb1d3b36fb02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 6 Apr 2022 21:24:56 +0200 Subject: dev-python/anyio: Fix tests, PEP 517 build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/832870 Signed-off-by: Michał Górny --- dev-python/anyio/anyio-3.5.0-r1.ebuild | 50 +++++++++++++++ dev-python/anyio/anyio-3.5.0.ebuild | 45 ------------- dev-python/anyio/files/anyio-3.5.0-pytest-7.patch | 78 +++++++++++++++++++++++ 3 files changed, 128 insertions(+), 45 deletions(-) create mode 100644 dev-python/anyio/anyio-3.5.0-r1.ebuild delete mode 100644 dev-python/anyio/anyio-3.5.0.ebuild create mode 100644 dev-python/anyio/files/anyio-3.5.0-pytest-7.patch (limited to 'dev-python') diff --git a/dev-python/anyio/anyio-3.5.0-r1.ebuild b/dev-python/anyio/anyio-3.5.0-r1.ebuild new file mode 100644 index 000000000000..cbbb327c2923 --- /dev/null +++ b/dev-python/anyio/anyio-3.5.0-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) + +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 arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86" + +RDEPEND=" + >=dev-python/idna-2.8[${PYTHON_USEDEP}] + >=dev-python/sniffio-1.1[${PYTHON_USEDEP}] +" +# On amd64, let's get more test coverage by dragging in uvloop, but let's +# not bother on other arches where uvloop may not be supported. +BDEPEND=" + test? ( + >=dev-python/hypothesis-4.0[${PYTHON_USEDEP}] + >=dev-python/pytest-7[${PYTHON_USEDEP}] + >=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}] + dev-python/trustme[${PYTHON_USEDEP}] + amd64? ( >=dev-python/uvloop-0.15[${PYTHON_USEDEP}] ) + ) +" + +distutils_enable_tests pytest +distutils_enable_sphinx docs \ + dev-python/sphinx_rtd_theme \ + dev-python/sphinx-autodoc-typehints + +PATCHES=( + "${FILESDIR}"/${P}-pytest-7.patch +) + +python_test() { + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + epytest -m 'not network' +} diff --git a/dev-python/anyio/anyio-3.5.0.ebuild b/dev-python/anyio/anyio-3.5.0.ebuild deleted file mode 100644 index 5379b452a5e4..000000000000 --- a/dev-python/anyio/anyio-3.5.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -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 arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - >=dev-python/idna-2.8[${PYTHON_USEDEP}] - >=dev-python/sniffio-1.1[${PYTHON_USEDEP}] -" -# On amd64, let's get more test coverage by dragging in uvloop, but let's -# not bother on other arches where uvloop may not be supported. -BDEPEND=" - test? ( - >=dev-python/hypothesis-4.0[${PYTHON_USEDEP}] - >=dev-python/pytest-6.2[${PYTHON_USEDEP}] - >=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}] - dev-python/trustme[${PYTHON_USEDEP}] - amd64? ( >=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 - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - distutils_install_for_testing --via-venv - epytest -m 'not network' -} diff --git a/dev-python/anyio/files/anyio-3.5.0-pytest-7.patch b/dev-python/anyio/files/anyio-3.5.0-pytest-7.patch new file mode 100644 index 000000000000..858404632959 --- /dev/null +++ b/dev-python/anyio/files/anyio-3.5.0-pytest-7.patch @@ -0,0 +1,78 @@ +From fed7cc4f95e196f68251bcb9253da3b143ea8e7e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= +Date: Mon, 7 Feb 2022 00:16:18 +0200 +Subject: [PATCH] Upgraded pytest to 7.0 + +--- + setup.cfg | 2 +- + tests/test_pytest_plugin.py | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/tests/test_pytest_plugin.py b/tests/test_pytest_plugin.py +index 4255702..f3b0e0c 100644 +--- a/tests/test_pytest_plugin.py ++++ b/tests/test_pytest_plugin.py +@@ -1,5 +1,5 @@ + import pytest +-from _pytest.pytester import Testdir ++from _pytest.pytester import Pytester + + from anyio import get_all_backends + +@@ -9,7 +9,7 @@ pytestmark = pytest.mark.filterwarnings( + pytest_args = '-v', '-p', 'anyio', '-p', 'no:asyncio' + + +-def test_plugin(testdir: Testdir) -> None: ++def test_plugin(testdir: Pytester) -> None: + testdir.makeconftest( + """ + import sniffio +@@ -67,7 +67,7 @@ def test_plugin(testdir: Testdir) -> None: + result.assert_outcomes(passed=3 * len(get_all_backends()), skipped=len(get_all_backends())) + + +-def test_asyncio(testdir: Testdir) -> None: ++def test_asyncio(testdir: Pytester) -> None: + testdir.makeconftest( + """ + import asyncio +@@ -140,7 +140,7 @@ def test_asyncio(testdir: Testdir) -> None: + result.assert_outcomes(passed=2, failed=1, errors=2) + + +-def test_autouse_async_fixture(testdir: Testdir) -> None: ++def test_autouse_async_fixture(testdir: Pytester) -> None: + testdir.makeconftest( + """ + import pytest +@@ -177,7 +177,7 @@ def test_autouse_async_fixture(testdir: Testdir) -> None: + result.assert_outcomes(passed=len(get_all_backends())) + + +-def test_cancel_scope_in_asyncgen_fixture(testdir: Testdir) -> None: ++def test_cancel_scope_in_asyncgen_fixture(testdir: Pytester) -> None: + testdir.makepyfile( + """ + import pytest +@@ -204,7 +204,7 @@ def test_cancel_scope_in_asyncgen_fixture(testdir: Testdir) -> None: + result.assert_outcomes(passed=len(get_all_backends())) + + +-def test_hypothesis_module_mark(testdir: Testdir) -> None: ++def test_hypothesis_module_mark(testdir: Pytester) -> None: + testdir.makepyfile( + """ + import pytest +@@ -235,7 +235,7 @@ def test_hypothesis_module_mark(testdir: Testdir) -> None: + result.assert_outcomes(passed=len(get_all_backends()) + 1, xfailed=len(get_all_backends())) + + +-def test_hypothesis_function_mark(testdir: Testdir) -> None: ++def test_hypothesis_function_mark(testdir: Pytester) -> None: + testdir.makepyfile( + """ + import pytest +-- +2.35.1 + -- cgit v1.2.3