gentoo auto-resync : 30:11:2024 - 02:06:22

6 files changed, 72 insertions, 56 deletions

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index adf8e89841d2..60ba09a2a8f3 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,10 +1,10 @@
+AUX 0001-Allow-knowledgeable-users-to-disable-validating-trov.patch 2790 BLAKE2B 9f795eb84b903ae97fbdd7580c8912a411dae6eae2eddf5d707e12d1c00868b1b7ea55188e7b1be997aa2d102f85f20a1f36c12370ca5d036f2872d9ec3f6713 SHA512 3197ce1935c406283cd102c87389b64c66fd7179e02ffb5551ca5c33e18c2a480f39b88eef6f686e0d3d27deea7ee2ab167c6cad5b183d54b7086edfe01581a5
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
-AUX setuptools-75.6.0-disable-trove-classifiers.patch 1383 BLAKE2B fa3bc1822badca21e102ea4f360ba4975906aced16a274622f69cfbb3a720d67cbbdb8f4d7a15e4545f3b96528f2e284e85116139ba0788c80ab6eb5cd4d3414 SHA512 9011ef7551479d9512f880a91c27ee1327fca2d19eb5e97bcbadbdf243f8de2cffd6351d4a03f5ee5a6b2442953b544d70e1c30106618582758290568d3af6e7
 DIST setuptools-74.1.3.tar.gz 1356471 BLAKE2B c59476710f10aae77f8b466ce2b072966a889b13c3e2e2a9524497ce43893bcd296412f8e0be8a3ccaa9be46b429680c11fe291095a65a185243701fa667be6c SHA512 7892d1ff0a1cd90f6cd367536392bf2933d354eb61d5177a01218b253bc254b51e74c040601adf35aff1652f1e1c6dbffca3cdce3f4fc32b8bd23c36cd885ddc
 DIST setuptools-75.5.0.tar.gz 1336032 BLAKE2B 3e06713c45212ef64b0f041089aa0621f3c12b850c9716e21181e91192378bb0596f81cfd6c484c3ec2d6f7e29ea7967fb17a7e5bbc2de996968be4fc47c2c32 SHA512 353ad99bb946d5ed07139f3a6d5f0efc9a4ca9721b060fce9095ee6fc74ac0e832fd0ebf7b2d1d68c71021db30561c5fea6abdde42174981f26002390a1e0e67
 DIST setuptools-75.6.0.tar.gz 1337429 BLAKE2B 65ba2e3de8dd0c86ab0ad59a5dc99a860ef5b59f357272eb2568347a496d853ef8e12a2d456dee3effe6f100bfb8d29e2f9f60123b58d791003ce3cddac23e8a SHA512 bdc12309165912f8de84e6f4ceaaf8f6b05dc1506a9205201784eb740346d773a7701af9b570cb13c272d81dcc0b4928e53ea1c4bb7c179debf479701c35bb6e
-EBUILD setuptools-74.1.3-r1.ebuild 4470 BLAKE2B 2d82fe6ef9827cb2e6e4be0df31ba27fc52be1f68e3e1401155048ff4941e88f17a8242baaeceef4968eb8db77a000ec91454de8ff920cacd308f860efac64aa SHA512 6d08c4a600c286ac315ba05d9949c9bda01f84017bd0226b24e2599fea090d1b926c5210ba639849dd841c4ff22f5610cba8e73e702a7e1e663f10c94e659926
-EBUILD setuptools-75.5.0.ebuild 4583 BLAKE2B 44454c89580bd4b79a2edb138a787145b783d005f00b581a0e0ce406b92d4f8f5336f830f3c14119a81b818bf240278f9f940a0199c8162ccb86a481dec44f66 SHA512 9513f25796d2135df67d93097edf7a203c91526aa5b508f4cd5deac590d4600f2dbd23fed7d9b1c50a2e5f912e3e1d355458979b5fe9fc2027a9cf969a070db9
-EBUILD setuptools-75.6.0-r1.ebuild 4712 BLAKE2B 164d92873857ef4886604fabcc95e972ea7c5dfc21aaa7ef239ae179bfebce1c87ad50f697a5434f5a222c259be3ee14146826a72ea7dbb302d6b556920f35da SHA512 a9e3c4b063685d0b2f1293d8a67dd2de9ae21b42e41eb4d25e6bad89011b1322859a124e69441b50f00cd83254ced33fb1d69c0afb5cdcaad181cab8c4430034
+EBUILD setuptools-74.1.3-r2.ebuild 4242 BLAKE2B ccd99b9f11355f29b46e851c1e0d7f183fd74844e5dfd96426b3cf3050b42d6ff71a34ae4c050750ca4c87f9ea25ad353665e54a66cd9519eb939b3d777c6445 SHA512 d42249f91700f63abe10ab1bae4a644d141a3a66208c0e23ff7cd593ccb5ec302121d41fd630afa45b7a871c1baab6ca14d27a61b73aed3a048fe62be3448796
+EBUILD setuptools-75.5.0-r1.ebuild 4355 BLAKE2B 1a9c982dcc8843261e43dd0a2f569b2ab196a769591f0c5d990d4dacf89ca478fce7a86a73c12bb850f067db89f004d970fd951d237b65b26e6489e0d1b35c5e SHA512 7100ee4ca15e251250f42a0c517b049f97f9cc48076503e813b74300966bc4af35c283c7ccc1513170d96f981843f4f870c5a1c1ddbe58812772668700ac3f30
+EBUILD setuptools-75.6.0-r2.ebuild 4355 BLAKE2B 1a9c982dcc8843261e43dd0a2f569b2ab196a769591f0c5d990d4dacf89ca478fce7a86a73c12bb850f067db89f004d970fd951d237b65b26e6489e0d1b35c5e SHA512 7100ee4ca15e251250f42a0c517b049f97f9cc48076503e813b74300966bc4af35c283c7ccc1513170d96f981843f4f870c5a1c1ddbe58812772668700ac3f30
 EBUILD setuptools-75.6.0.ebuild 4583 BLAKE2B 44454c89580bd4b79a2edb138a787145b783d005f00b581a0e0ce406b92d4f8f5336f830f3c14119a81b818bf240278f9f940a0199c8162ccb86a481dec44f66 SHA512 9513f25796d2135df67d93097edf7a203c91526aa5b508f4cd5deac590d4600f2dbd23fed7d9b1c50a2e5f912e3e1d355458979b5fe9fc2027a9cf969a070db9
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/files/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch b/dev-python/setuptools/files/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch
new file mode 100644
index 000000000000..4ab6bbae7af4
--- /dev/null
+++ b/dev-python/setuptools/files/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch
@@ -0,0 +1,65 @@
+From f694e474ab3c45af6241a3f2bf575f8188e9cbea Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@gentoo.org>
+Date: Mon, 11 Nov 2024 19:51:54 -0500
+Subject: [PATCH] Allow knowledgeable users to disable validating
+ trove-classifiers
+
+Classifiers are based on a "blessed list" of search terms that are
+allowed on https://pypi.org and need to be regularly kept up to date in
+order to validate them.
+
+Many people don't care about this. Arguably, *no one* cares about this,
+since wheels that have search terms that PyPI doesn't consider popular
+enough will simply fail uploading to PyPI. But also, not everyone wants
+to download new lists of "allowed words" from the internet every time
+they check to see if e.g. pyproject.toml contains a valid format that
+won't traceback when someone tries to read the "name" field and gets an
+integer instead of a string. Or their entrypoints are malformed because
+they aren't a valid python object reference.
+
+This is also an issue because one might have an old version of the
+classifiers cached, and then a new classifier is added to
+https://pypi.org and you want to use it immediately, and the local
+validator in the form of validate_pyproject fails but actually uploading
+a wheel to https://pypi.org would work fine.
+
+Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
+Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
+---
+ .../config/_validate_pyproject/formats.py      | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/setuptools/config/_validate_pyproject/formats.py b/setuptools/config/_validate_pyproject/formats.py
+index 153b1f0b2..50b8520e9 100644
+--- a/setuptools/config/_validate_pyproject/formats.py
++++ b/setuptools/config/_validate_pyproject/formats.py
+@@ -205,15 +205,19 @@ class _TroveClassifier:
+         return value in self.downloaded or value.lower().startswith("private ::")
+ 
+ 
+-try:
+-    from trove_classifiers import classifiers as _trove_classifiers
+-
++if os.getenv("GENTOO_VALIDATE_PYPROJECT_NO_TROVE_CLASSIFIERS"):
+     def trove_classifier(value: str) -> bool:
+-        """See https://pypi.org/classifiers/"""
+-        return value in _trove_classifiers or value.lower().startswith("private ::")
++        return True
++else:
++    try:
++        from trove_classifiers import classifiers as _trove_classifiers
+ 
+-except ImportError:  # pragma: no cover
+-    trove_classifier = _TroveClassifier()
++        def trove_classifier(value: str) -> bool:
++            """See https://pypi.org/classifiers/"""
++            return value in _trove_classifiers or value.lower().startswith("private ::")
++
++    except ImportError:  # pragma: no cover
++        trove_classifier = _TroveClassifier()
+ 
+ 
+ # -------------------------------------------------------------------------------------
+-- 
+2.45.2
+
diff --git a/dev-python/setuptools/files/setuptools-75.6.0-disable-trove-classifiers.patch b/dev-python/setuptools/files/setuptools-75.6.0-disable-trove-classifiers.patch
deleted file mode 100644
index c5111e985f61..000000000000
--- a/dev-python/setuptools/files/setuptools-75.6.0-disable-trove-classifiers.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0d9e8bc7d6df86381ac56770dc95fc75276f49ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 21 Nov 2024 20:40:14 +0100
-Subject: [PATCH] Add an option to disable using trove-classifiers package
-
-As requested in https://github.com/pypa/setuptools/issues/4459, add
-a VALIDATE_PYPROJECT_NO_TROVE_CLASSIFIERS environment variable that can
-be used to disable using trove_classifiers package even if it is
-available.  This can be used when the system features an outdated
-trove_classifiers, and therefore incorrectly triggers validation error.
-The change is designed to be absolutely minimal and non-intrusive.
----
- setuptools/config/_validate_pyproject/formats.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/setuptools/config/_validate_pyproject/formats.py b/setuptools/config/_validate_pyproject/formats.py
-index aacf4092b..0b05ab17b 100644
---- a/setuptools/config/_validate_pyproject/formats.py
-+++ b/setuptools/config/_validate_pyproject/formats.py
-@@ -210,6 +210,9 @@ try:
-         """See https://pypi.org/classifiers/"""
-         return value in _trove_classifiers or value.lower().startswith("private ::")
- 
-+    if os.getenv("VALIDATE_PYPROJECT_NO_TROVE_CLASSIFIERS"):  # pragma: no cover
-+        raise ImportError()
-+
- except ImportError:  # pragma: no cover
-     trove_classifier = _TroveClassifier()
- 
--- 
-2.47.0
-
diff --git a/dev-python/setuptools/setuptools-74.1.3-r1.ebuild b/dev-python/setuptools/setuptools-74.1.3-r2.ebuild
index 9cc97e5921d2..62bcc9708b4a 100644
--- a/dev-python/setuptools/setuptools-74.1.3-r1.ebuild
+++ b/dev-python/setuptools/setuptools-74.1.3-r2.ebuild
@@ -64,20 +64,15 @@ BDEPEND="
 "
 # setuptools-scm is here because installing plugins apparently breaks stuff at
 # runtime, so let's pull it early. See bug #663324.
-#
-# trove-classifiers are optionally used in validation, if they are
-# installed.  Since we really oughtn't block them, let's always enforce
-# the newest version for the time being to avoid errors.
-# https://github.com/pypa/setuptools/issues/4459
 PDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
 "
 
 src_prepare() {
 	local PATCHES=(
 		# TODO: remove this when we're 100% PEP517 mode
 		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
+		"${FILESDIR}"/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch
 	)
 
 	distutils-r1_src_prepare
diff --git a/dev-python/setuptools/setuptools-75.5.0.ebuild b/dev-python/setuptools/setuptools-75.5.0-r1.ebuild
index 8bd616a1e315..9e5a6fe7eb3f 100644
--- a/dev-python/setuptools/setuptools-75.5.0.ebuild
+++ b/dev-python/setuptools/setuptools-75.5.0-r1.ebuild
@@ -66,20 +66,15 @@ BDEPEND="
 "
 # setuptools-scm is here because installing plugins apparently breaks stuff at
 # runtime, so let's pull it early. See bug #663324.
-#
-# trove-classifiers are optionally used in validation, if they are
-# installed.  Since we really oughtn't block them, let's always enforce
-# the newest version for the time being to avoid errors.
-# https://github.com/pypa/setuptools/issues/4459
 PDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
 "
 
 src_prepare() {
 	local PATCHES=(
 		# TODO: remove this when we're 100% PEP517 mode
 		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
+		"${FILESDIR}"/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch
 	)
 
 	distutils-r1_src_prepare
diff --git a/dev-python/setuptools/setuptools-75.6.0-r1.ebuild b/dev-python/setuptools/setuptools-75.6.0-r2.ebuild
index a9961b9303cc..9e5a6fe7eb3f 100644
--- a/dev-python/setuptools/setuptools-75.6.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-75.6.0-r2.ebuild
@@ -66,22 +66,15 @@ BDEPEND="
 "
 # setuptools-scm is here because installing plugins apparently breaks stuff at
 # runtime, so let's pull it early. See bug #663324.
-#
-# trove-classifiers are optionally used in validation, if they are
-# installed.  Since we really oughtn't block them, let's always enforce
-# the newest version for the time being to avoid errors.
-# https://github.com/pypa/setuptools/issues/4459
 PDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
 "
 
 src_prepare() {
 	local PATCHES=(
 		# TODO: remove this when we're 100% PEP517 mode
 		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-		# https://github.com/abravalheri/validate-pyproject/pull/221
-		"${FILESDIR}/setuptools-75.6.0-disable-trove-classifiers.patch"
+		"${FILESDIR}"/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch
 	)
 
 	distutils-r1_src_prepare