gentoo resync : 06.04.2022

4 files changed, 89 insertions, 52 deletions

diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 0110029c77bb..3781154b0e63 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,5 +1,4 @@
-DIST anyio-3.4.0.tar.gz 135737 BLAKE2B 6023d051a10a067b8c86576dd80571a64c72a807c56235ecd7bad364b79b10c5b845c6b584c5310db01b3bfdd92deeaf64b855716b9fa817fe2fc590de33ec4c SHA512 276fb5fc243e2c7f80a069f604ef68eeaca923c0df6f533878f9bf2185e846e537a1b9a8f19260a3c9ad3aad70898884316e6783057044a936762f7eb1f1cb9a
+AUX anyio-3.5.0-pytest-7.patch 2624 BLAKE2B e9a1fd06838f2d8fd9c2a2a1e33f6d55d5d9b0edfbb3eb1cc703164a2c85e1f7c3a1a099b6b659826098b5710352b289dcb129b5248c1a6fa392efd26652f258 SHA512 207d7e4cd4b3be7399625874bfae47be94b7593e53a1fd61f84ee87810992c0a06a466ca47b1419858d81879c25ba6666e043015ce5271034186d77a506e290f
 DIST anyio-3.5.0.tar.gz 136934 BLAKE2B 422d604c23658844467926f42c09895e54debfd3ddf2f7fa561eccae0c9cbc225f51d663cb9f98a2455736ad7a81eb4ae40a6f3ad66f3d2f0b02d0a5157203e0 SHA512 b91124c95d194eb7e4542405a973895d21562a2636d9600d528465da52536d1ffedbf5a6fc3ea5b1ff3e83e7dca2b42f090bb2ff6b077e32f5a2c314f07d3206
-EBUILD anyio-3.4.0.ebuild 1093 BLAKE2B ba828d6d187689d45f44f7e0dfb685f81afa357fea4a4589f94f996c420a6529cff46e1daa4d173581b79d796e148257d6db444289434de882aac2b20d749305 SHA512 5d2e07bf8468f2b9bbfbfde58d0ace51507ac0c6919e851c6fa3c7d7d2b54d51541fce789a1cb6c03c18d2c4bcf4743dd78fb19fc571b4e3f9e658b456f3dbdc
-EBUILD anyio-3.5.0.ebuild 1252 BLAKE2B fd4a6f00598610d11999c27def585b210748e2544b03a4a3dc775561bdd7ee9f64c639981c2f1da6f2962580c88e808afee46f9835faf1a832153eb0678406ca SHA512 e231848bc83f73705fc70f78835e4c69e1a0a1591a6115d7f7114b348efa1b01ae79eb187d908f3e8fe24ea6de93014c613a300bb7a7ea1abd0d016ff199f86b
+EBUILD anyio-3.5.0-r1.ebuild 1280 BLAKE2B c8ac3efda1b2d446405787238ae535fedc4c5d2e0c8c5d82dd26a70bd201600d19dd964198ad6444fb0897bd693163ad07f91fe13945a6c4cb23a97566795380 SHA512 b014a15f307cfa893b743998d171f38d7f5df75e87e36e97151915f376781b641fcd1a25af6d8c8f40edf8a2de202f8bff02ad98fc02a800aeeab63c421f2e9b
 MISC metadata.xml 1321 BLAKE2B 22708116b3b04529a83c9e005e421dab21dd5b259df12c3c7e75c74cc3505510b828ebe9808a234ce91d0fc2f17476bf884050561efb18892eb13c35806bbfc1 SHA512 6c1333b6e58faacacf68cd1bd6544c5b28d55ebb75efba1702aa5e2d4f28c29ac86dbbfd45dbb8af1dc2bf69476667d52c7f14bc765d836133e0811c6f2c880e
diff --git a/dev-python/anyio/anyio-3.4.0.ebuild b/dev-python/anyio/anyio-3.4.0.ebuild
deleted file mode 100644
index e8baabafef7d..000000000000
--- a/dev-python/anyio/anyio-3.4.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=7
-
-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 ppc ppc64 ~riscv sparc x86"
-
-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-6.2[${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
-
-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/anyio-3.5.0.ebuild b/dev-python/anyio/anyio-3.5.0-r1.ebuild
index 5379b452a5e4..cbbb327c2923 100644
--- a/dev-python/anyio/anyio-3.5.0.ebuild
+++ b/dev-python/anyio/anyio-3.5.0-r1.ebuild
@@ -3,12 +3,14 @@
 
 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://github.com/agronholm/anyio/
 	https://pypi.org/project/anyio/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
@@ -26,20 +28,23 @@ RDEPEND="
 BDEPEND="
 	test? (
 		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.2[${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 --install pytest
+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
-	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?= <alex.gronholm@nextday.fi>
+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
+