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

[Michał Górny]

commit:     b1ec7f57e54bad19fce1842681d72ca06f7948bc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 05:56:28 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 06:51:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ec7f57

dev-python/setuptools: Relax dev-python/packaging dep

Portage seems to have trouble with ordering the combined setuptools
and packaging upgrade, and setuptools seems to work just fine (modulo
a few tests relying on new packaging behavior) with the old version,
so permit upgrading setuptools first.

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

 .../{setuptools-67.2.0.ebuild => setuptools-67.2.0-r1.ebuild}    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev-python/setuptools/setuptools-67.2.0.ebuild 
b/dev-python/setuptools/setuptools-67.2.0-r1.ebuild
similarity index 93%
rename from dev-python/setuptools/setuptools-67.2.0.ebuild
rename to dev-python/setuptools/setuptools-67.2.0-r1.ebuild
index b6d46c764db4..f46eb55ab7f3 100644
--- a/dev-python/setuptools/setuptools-67.2.0.ebuild
+++ b/dev-python/setuptools/setuptools-67.2.0-r1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
        >=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
        >=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
        >=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-       >=dev-python/packaging-23[${PYTHON_USEDEP}]
+       >=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
        >=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
        >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
        $(python_gen_cond_dep '
@@ -117,5 +117,12 @@ python_test() {
                
setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
        )
 
+       if has_version "<dev-python/packaging-22"; then
+               EPYTEST_DESELECT+=(
+                       # old packaging is more lenient
+                       
setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
+               )
+       fi
+
        epytest -n "$(makeopts_jobs)" setuptools
 }