From 75f9cd36ea239370afc363e9f4035355d74a517d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 5 Jul 2024 17:12:17 +0200 Subject: [PATCH] dev-python/setuptools: Add a PDEP on dev-python/trove-classifiers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- ...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(+) rename dev-python/setuptools/{setuptools-70.1.1.ebuild => setuptools-70.1.1-r1.ebuild} (94%) rename dev-python/setuptools/{setuptools-70.2.0.ebuild => setuptools-70.2.0-r1.ebuild} (94%) 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 795508feb7a76..78ec6f84b7531 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 6bcb4530cd44d..ee5ce0b32cdb5 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() {