gentoo resync : 29.12.2022

4 files changed, 9 insertions, 89 deletions

diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index ede044c28167..50711e1f46a3 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,4 +1,3 @@
-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.5.0-r1.ebuild 1384 BLAKE2B f8e9e433032e988ddfea16c92c9958fa6e0361de2f16fa266fb90c281042accfd91325ffc8e82f5c2029ac6ec07f01768c1bf4e67e0ebfa3aef025d9afd1978f SHA512 1d76d8380944877dc4eea7faca809744fd3cf4d5debde055d6e396bf6bce4661c60dcd29e827995e8cc03eb19dfb95ed43096ec73374244752dd633ec658642e
-MISC metadata.xml 1321 BLAKE2B 22708116b3b04529a83c9e005e421dab21dd5b259df12c3c7e75c74cc3505510b828ebe9808a234ce91d0fc2f17476bf884050561efb18892eb13c35806bbfc1 SHA512 6c1333b6e58faacacf68cd1bd6544c5b28d55ebb75efba1702aa5e2d4f28c29ac86dbbfd45dbb8af1dc2bf69476667d52c7f14bc765d836133e0811c6f2c880e
+DIST anyio-3.6.1.tar.gz 140240 BLAKE2B 391892591bee88df8fd5c099b6670af8e01af0610f7659e2f2e717c2dfd94d6e5212260acf3acca6c8b149cab6781044fb665d579a63b322332bf87767374858 SHA512 99ae55eada2df971405a1592afd980ac964c80a4502465a2016423182409691d0c943280a3a7448efc78036e481614451585238b62ebea924709f0ba888f7604
+EBUILD anyio-3.6.1.ebuild 1300 BLAKE2B 42ceb4294e4567c3491dd6b82d5461d7b8ea8e335dc56fa727bb2374e94b392c45a682613024726230aa72e1bd8a39c8ad088e317f502ceea89e14f3bfb60289 SHA512 aa362a78e27a0340f21cdea392124841a17909e36cb859775c4f8b7045b20e11866054e972d23d562cefde81c1b69689bbe2cc056347a09dd89c35d6313a2c2e
+MISC metadata.xml 1422 BLAKE2B 63acae587e7088e33ee5eb93a2a222899e54a5eb511118794f88e7c5a012d10983eb925427688a0b509b094e30a9cc9acc5f0c1765ea73e569161e0c30722000 SHA512 e0b540d5d739b7673a5a8682477f209f8b3648aad06a1c0610543a2e9dcbeca1cb1e52212d8088a5987a1c3bc3152cc5984ad5b5d0706fcdb5866b22de07b1eb
diff --git a/dev-python/anyio/anyio-3.5.0-r1.ebuild b/dev-python/anyio/anyio-3.6.1.ebuild
index a90f9a7309cb..1b5b39a19de0 100644
--- a/dev-python/anyio/anyio-3.5.0-r1.ebuild
+++ b/dev-python/anyio/anyio-3.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -28,14 +28,13 @@ RDEPEND="
 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/trio[${PYTHON_USEDEP}]
 		dev-python/trustme[${PYTHON_USEDEP}]
 		amd64? (
 			$(python_gen_cond_dep '
 				>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
-			' 'python*')
+			' python3_{8..10})
 		)
 	)
 "
@@ -45,10 +44,6 @@ 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/files/anyio-3.5.0-pytest-7.patch b/dev-python/anyio/files/anyio-3.5.0-pytest-7.patch
deleted file mode 100644
index 858404632959..000000000000
--- a/dev-python/anyio/files/anyio-3.5.0-pytest-7.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-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
-
diff --git a/dev-python/anyio/metadata.xml b/dev-python/anyio/metadata.xml
index 76de23035d76..bfd9e087677c 100644
--- a/dev-python/anyio/metadata.xml
+++ b/dev-python/anyio/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<longdescription lang="en">
 AnyIO is a asynchronous compatibility API that allows applications and libraries written against it to run unmodified on asyncio, curio and trio.