gentoo auto-resync : 06:02:2024 - 15:58:48

3 files changed, 57 insertions, 1 deletions

diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index c9632cf748a8..5cdd7be9deae 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,5 +1,6 @@
+AUX pytest-asyncio-0.23.4-pytest-8.patch 1736 BLAKE2B 8f603b2a2c468f1f85c92842f0b47ca8ade9e6e45bfb9b417da61410604faf209e468e9a716a56bf714bab9d5b14aef822db300a27168f65c35dda1844d43a71 SHA512 badde4aaf63f995ff38fc2ef6804fd0b5cfdc5ce7fbd5e2e3f28048c1e64dacf1d1929cac0d15ec801e74ad49e634540209c9baa8c09f2a5e19e4016ff8142f0
 DIST pytest-asyncio-0.23.2.tar.gz 44174 BLAKE2B 36dbd0022416eef05c781b9f74fd143bb52fe0583461ca7e52fd4981d552bbefdddd8e3a3399bc229a8ae68b150e199237ae0ce3a375075ab8f7f507bfa59316 SHA512 aa5b5fe8b633b187303dd2958d2ea01561604044507da107e46115d9bf4c1ac3c78826b4b6a6cbf474a6ee4ce0cd1bede87a2c8fe0d35397ddf6a4069437dd84
 DIST pytest-asyncio-0.23.4.tar.gz 45162 BLAKE2B 69092bff908beb2b707d281142145edf0508bcb09aa59e4a91d18b3cdb24e5533436a9668e2d243425b4914f2913e6186fa6d8b6c1d187b6bf25191986d27981 SHA512 831c572ae981b8575f97dd4d0d40d960d49cbeeb6b186e1c094eb45b1f48210824780ca14cbf44d1da558b1a17ca1fefc0eda26137461172bbd12f8b25ab8ebb
 EBUILD pytest-asyncio-0.23.2.ebuild 1502 BLAKE2B 4bbf1e0e7b4ad35829ce587b367384cd3d5c0e170347f27d4d8948eea5aba4fde10b6bc2a79eab9f8dcf9c137bf3a3d4ea7916fd415839cc7a957670a6f59f5d SHA512 980b67811fc3596c910d51b520a971351d47e6813b42e08af4de32aa30a1417b8084d74c0c8cbac33352b8c55a2ff893a395f6fdbdf8a8ed310839a51e54da36
-EBUILD pytest-asyncio-0.23.4.ebuild 1510 BLAKE2B 079ea24bc853828c89b7347c7a5c15e42168b5de460968ba2b2015e7780c721b398ef7dcc247afa8154c3b3a214dfaa5372db0da9d6610101c5c87909005f51a SHA512 d3e92e0cb11d90853f8e73bbaa724214851a33f31ed8809e526d1e50db68626c0d63c979facf87cb47795aabec35719011080cea5805bb8cb8e7ec341b18b174
+EBUILD pytest-asyncio-0.23.4-r1.ebuild 1718 BLAKE2B cc45a5663ffdc9ca3d49e1e4517e633730810e2818ba78f026312df663222f296aebe2139fac5cf14666a51c14e91b28340a9a8de6d8a16eb1f94b72a5e53b19 SHA512 22a19f0259fd253a1dced23f1f49e6a38f54d3c433ee2e8618b4d542aab7923610b638803c8fdc792f79399607c8b3d7274ad32f7427ac35383031e28ec087a3
 MISC metadata.xml 385 BLAKE2B 3d8faba48e1b3e531ea338f08f2de4b7bf637190e65fc61df2bd4d994cc97707016f83927f4a5181ac27d412a8c91255e90caba15f2d687f2339bc8ea61b18f2 SHA512 71178d3fba362e7532c87cb519f3661b25018771b86c302660de11f1bc7817b8352a2c8fcf60084a5e62b15148307a360267381ac38e8c856784034d80327d4d
diff --git a/dev-python/pytest-asyncio/files/pytest-asyncio-0.23.4-pytest-8.patch b/dev-python/pytest-asyncio/files/pytest-asyncio-0.23.4-pytest-8.patch
new file mode 100644
index 000000000000..d18c5714005b
--- /dev/null
+++ b/dev-python/pytest-asyncio/files/pytest-asyncio-0.23.4-pytest-8.patch
@@ -0,0 +1,47 @@
+From d53c12962fd7250bea28e03b5a141be73cfce06b Mon Sep 17 00:00:00 2001
+From: Arjan Keeman <akeeman@users.noreply.github.com>
+Date: Tue, 6 Feb 2024 14:46:13 +0100
+Subject: [PATCH] fix compatibility with pytest ^8
+
+diff --git a/setup.cfg b/setup.cfg
+index 45d70b3..e8cbfc5 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -40,5 +40,5 @@ include_package_data = True
+ install_requires = 
+-	pytest >= 7.0.0,<8
++	pytest >= 7.0.0, !=8.0.0rc1, !=8.0.0rc2
+ 
+ [options.extras_require]
+ testing =
+diff --git a/tests/markers/test_session_scope.py b/tests/markers/test_session_scope.py
+index bd0baee..9049c17 100644
+--- a/tests/markers/test_session_scope.py
++++ b/tests/markers/test_session_scope.py
+@@ -44,7 +44,9 @@ def test_asyncio_mark_provides_session_scoped_loop_strict_mode(pytester: Pyteste
+             """
+         ),
+     )
+-    subpackage_name = "subpkg"
++
++    # subpackage_name must alphabetically come after test_module_one.py
++    subpackage_name = "z_subpkg"
+     subpkg = pytester.mkpydir(subpackage_name)
+     subpkg.joinpath("test_subpkg.py").write_text(
+         dedent(
+diff --git a/tests/test_is_async_test.py b/tests/test_is_async_test.py
+index 512243b..12e791c 100644
+--- a/tests/test_is_async_test.py
++++ b/tests/test_is_async_test.py
+@@ -77,8 +77,10 @@ def test_returns_false_for_unmarked_coroutine_item_in_strict_mode(pytester: Pyte
+     if pytest.version_tuple < (7, 2):
+         # Probably related to https://github.com/pytest-dev/pytest/pull/10012
+         result.assert_outcomes(failed=1)
+-    else:
++    elif pytest.version_tuple < (8,):
+         result.assert_outcomes(skipped=1)
++    else:
++        result.assert_outcomes(failed=1)
+ 
+ 
+ def test_returns_true_for_unmarked_coroutine_item_in_auto_mode(pytester: Pytester):
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.23.4.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.23.4-r1.ebuild
index f54360ce4842..22c4e61869b2 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.23.4.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.23.4-r1.ebuild
@@ -31,6 +31,11 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/pytest-dev/pytest-asyncio/pull/776
+	"${FILESDIR}/${P}-pytest-8.patch"
+)
+
 python_test() {
 	local EPYTEST_DESELECT=(
 		# rely on precise warning counts
@@ -41,6 +46,9 @@ python_test() {
 		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_test_leaves_loop_unclosed
 		tests/test_pytest_min_version_warning.py
 		tests/trio/test_fixtures.py::test_strict_mode_ignores_trio_fixtures
+
+		# TODO
+		tests/test_is_async_test.py::test_returns_false_for_unmarked_coroutine_item_in_strict_mode
 	)
 
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1