[gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/

["Michał Górny" <mgorny@gentoo.org>]

commit:     75f9cd36ea239370afc363e9f4035355d74a517d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  5 15:12:17 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul  5 15:54:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f9cd36

dev-python/setuptools: Add a PDEP on dev-python/trove-classifiers

Modern versions of setuptools optionally use
dev-python/trove-classifiers for verification.  This has the side issue
that if an old version happens to be installed, random packages may
fail to install.  Until upstream makes this properly optional (and we
disable it), depend on the very newest version.

Andrew noticed it while trying to bump dev-python/pyzotero.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../{setuptools-70.1.1.ebuild => setuptools-70.1.1-r1.ebuild}       | 5 +++++
 .../{setuptools-70.2.0.ebuild => setuptools-70.2.0-r1.ebuild}       | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/dev-python/setuptools/setuptools-70.1.1.ebuild b/dev-python/setuptools/setuptools-70.1.1-r1.ebuild
similarity index 94%
rename from dev-python/setuptools/setuptools-70.1.1.ebuild
rename to dev-python/setuptools/setuptools-70.1.1-r1.ebuild
index 795508feb7a7..78ec6f84b753 100644
--- a/dev-python/setuptools/setuptools-70.1.1.ebuild
+++ b/dev-python/setuptools/setuptools-70.1.1-r1.ebuild
@@ -63,8 +63,13 @@ 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.
 PDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	>=dev-python/trove-classifiers-2024.7.2[${PYTHON_USEDEP}]
 "
 
 src_prepare() {

diff --git a/dev-python/setuptools/setuptools-70.2.0.ebuild b/dev-python/setuptools/setuptools-70.2.0-r1.ebuild
similarity index 94%
rename from dev-python/setuptools/setuptools-70.2.0.ebuild
rename to dev-python/setuptools/setuptools-70.2.0-r1.ebuild
index 6bcb4530cd44..ee5ce0b32cdb 100644
--- a/dev-python/setuptools/setuptools-70.2.0.ebuild
+++ b/dev-python/setuptools/setuptools-70.2.0-r1.ebuild
@@ -63,8 +63,14 @@ 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.7.2[${PYTHON_USEDEP}]
 "
 
 src_prepare() {