gentoo auto-resync : 21:06:2024 - 00:11:18

3 files changed, 48 insertions, 10 deletions

diff --git a/dev-python/apache-libcloud/Manifest b/dev-python/apache-libcloud/Manifest
index 86a7e7f57884..ec76831c25a1 100644
--- a/dev-python/apache-libcloud/Manifest
+++ b/dev-python/apache-libcloud/Manifest
@@ -1,3 +1,4 @@
+AUX apache-libcloud-3.8.0-pytest-8.2.patch 952 BLAKE2B 6da7b836551bb251d61bc9380d23216779eaca3b7c71ed5d3e6419b7d9b42939063cc073cb2324a91f22f740eeddd85fa39ea6df5fad07b83923ddddc5098756 SHA512 e3e8a5c226ceba42b155eb2b40df0b49a1a2ca8a759b7c9137d2085f95aa355e240a3c069abcd620a0c24717b4a5d43a552cee196c0d2699096d38fc9a5b0c0a
 DIST apache-libcloud-3.8.0.tar.gz 2457665 BLAKE2B 39a6f3f99d3b685150e9a5ec198da705e0c8a3fed7da1300a734fe69310f888401da6683a8ea4b3fe042776a19ebff28f7c82921f29ebc91349a3c1a24e60e20 SHA512 ef221c79be2adf22bbd9fa739c619fa8c0afb493a410bf36a6cf2b3ad5cb18b61f552a1d98400b9152c790e3a88ca504848e03bae1fe8a14b94f72f9b7358f50
-EBUILD apache-libcloud-3.8.0-r1.ebuild 1297 BLAKE2B 50d36f6dc70b8da70b00be51990bc4a7683a44283e463c11d27eab63a5e05b1f0aabba09257bd032cf6debc720c34d2ff6f7704f121cd622741ca84083901768 SHA512 f7ab8c9ee5ea81930faff042dc8e7fd992a03611e5759ed5bbc136996024162e9e5fdff3b9fe57b75ffb04c618a8b6c0d7d0839eb722a7923a84443e9b03af4c
+EBUILD apache-libcloud-3.8.0-r1.ebuild 1567 BLAKE2B 860c77eb7eb6caa89c60cf98bbb95969e70463d197fe77ccdedbaa3f4c99c026de224f046e1cfc2fbb102ee513db294b771a7cd7530f4e708138f95e08985e98 SHA512 a09d5f5a1190b772164d34311b41967aa4cc259afc93584c1aaf03680ca585c305e4f6d6e1f715f5f10d6f9ce25c54528ab15e7ac6cd4f1a3c0f44360b23257b
 MISC metadata.xml 398 BLAKE2B 5623f486a289eea0196b22b2f88ff377589bbcea13e341efd85d31dee07f8638bc985e6a1c03ac7982da08c879b5b09a46e5679fda8666f93366a8561777da7c SHA512 bc6e38c949ed0513f4e562406fd84031cd80f01a881844202e033fe5225490d42b27855413cd7d2fec216b002c38e1832fa8f841112c68628c906189ebf1e937
diff --git a/dev-python/apache-libcloud/apache-libcloud-3.8.0-r1.ebuild b/dev-python/apache-libcloud/apache-libcloud-3.8.0-r1.ebuild
index 26ad934cf8f7..531a21e0f26a 100644
--- a/dev-python/apache-libcloud/apache-libcloud-3.8.0-r1.ebuild
+++ b/dev-python/apache-libcloud/apache-libcloud-3.8.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1 pypi
@@ -35,13 +35,14 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-EPYTEST_DESELECT=(
-	# Needs network access
-	libcloud/test/compute/test_ovh.py::OvhTests::test_list_nodes_invalid_region
-	libcloud/test/test_connection.py::BaseConnectionClassTestCase::test_connection_timeout_raised
-)
-
 src_prepare() {
+	local PATCHES=(
+		# https://github.com/apache/libcloud/pull/2014
+		"${FILESDIR}/${P}-pytest-8.2.patch"
+	)
+
+	distutils-r1_src_prepare
+
 	if use examples; then
 		mkdir examples || die
 		mv example_*.py examples || die
@@ -49,8 +50,19 @@ src_prepare() {
 
 	# needed for tests
 	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
+}
 
-	distutils-r1_src_prepare
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Needs network access
+		libcloud/test/compute/test_ovh.py::OvhTests::test_list_nodes_invalid_region
+		libcloud/test/test_connection.py::BaseConnectionClassTestCase::test_connection_timeout_raised
+		# TODO
+		libcloud/test/test_init.py::TestUtils::test_init_once_and_debug_mode
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
 }
 
 src_install() {
diff --git a/dev-python/apache-libcloud/files/apache-libcloud-3.8.0-pytest-8.2.patch b/dev-python/apache-libcloud/files/apache-libcloud-3.8.0-pytest-8.2.patch
new file mode 100644
index 000000000000..03917b0dac75
--- /dev/null
+++ b/dev-python/apache-libcloud/files/apache-libcloud-3.8.0-pytest-8.2.patch
@@ -0,0 +1,25 @@
+From 0b69d0bf23b6c2edb1e2002f47ff2df0080e96d9 Mon Sep 17 00:00:00 2001
+From: Steve Kowalik <steven@wedontsleep.org>
+Date: Thu, 6 Jun 2024 12:25:15 +1000
+Subject: [PATCH] Mark MockHttp as not for collection by pytest
+
+pytest 8.2.0 contains a regression that will collect non-test classes,
+so as to be explicit about it, mark MockHttp (and therefore all of its
+children classes) as not to be collected.
+---
+ libcloud/test/__init__.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libcloud/test/__init__.py b/libcloud/test/__init__.py
+index d45c82c84d..d0da40c74a 100644
+--- a/libcloud/test/__init__.py
++++ b/libcloud/test/__init__.py
+@@ -97,6 +97,8 @@ class MockHttp(LibcloudConnection):
+ 
+         (int status, str body, dict headers, str reason)
+     """
++    # pytest may collect this class, and we don't need or want that
++    __test__ = False
+ 
+     type = None
+     use_param = None  # will use this param to namespace the request function