commit: 971be4ecca29fecc655da9f1ba8321de5075cfdb Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Dec 2 09:41:37 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Dec 2 09:41:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971be4ec
dev-python/setuptools: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/setuptools/Manifest | 2 - .../setuptools-58.2.0-fix-pypy3.8-install.patch | 78 ------------------- dev-python/setuptools/setuptools-58.2.0-r1.ebuild | 91 ---------------------- dev-python/setuptools/setuptools-59.3.0.ebuild | 87 --------------------- 4 files changed, 258 deletions(-) diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index 70ff7fb80a4f..cc4e847deb0d 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -1,7 +1,5 @@ DIST python-gentoo-patches-3.10.0_p1.tar.xz 10068 BLAKE2B 1c9817b449831559f0a0b722c02a5f55d94b3dfde98e5882c1403fe24a4addf7074ab39c09b91cff6fd7ace2e4b6e8ed899d9a0b9ffd6612ce315c4c192bd309 SHA512 39aa41dbf17b6dc5255491c75031a3dae6962b44125e426dbfdce365a6533c5dae9856b1fff8016a189124b7cff72d2665ce99da344c2f9dff005ba685e8c2c4 DIST python-gentoo-patches-3.10.0rc1.tar.xz 8112 BLAKE2B d6f9b44c5a231f447ffe3533afbcaffe0f3b8bdd5a6690f1854bd7e1199d036d11a4cf4abfae345a88c42740ccbd4b72e53cbe28aea1a5db39dda1e5bfd47229 SHA512 bba7045f56369ca0354a539f8478a1afed77dc89a9faf548a0cf8959d644360b0afc4f84b95151ebfc2a6553078322c7445073f7a4104e9cd639ccc86ad0f792 DIST setuptools-57.5.0.tar.gz 2141727 BLAKE2B 54c065e0bdcb0c3a0a76026d78ab26615e07ee013e684ef18c3731757a38efe38d21d4c99b687595873679d77ab8381cccc483847467c98eb7086d9cac5bd8ec SHA512 9dae7cbddcca0859d128f528232c2ab6baca2b4447bba129a7bbc014c98a8ecc866cc71c7e93900bb93ea4bbbe5e398c1c3b4a4867afb2caf2c38a2d5a46d67c -DIST setuptools-58.2.0.tar.gz 2268140 BLAKE2B 13281c3b2ed664fdcec77117cded285fb5b608036c19715c7c786734bb04cc02bc0f300a28e7c49967f695a6b706f9413baa33d99ac4f1f957522136ee5857e0 SHA512 028c9d9533f5493ff89c80c705ea002661a70e0e43afecb0c7546029990ae599e16fad7248ffc29573c18c6aeb33f1bba1fde09f25fe04b74717ad9308ce9cfc DIST setuptools-59.2.0.tar.gz 2281261 BLAKE2B 40d929a7a15d469e66b5f0db744663d0debfc9559806bebd141f5659965e47ebbd3f05ae4fe0dfd514db10507c5fffb4ab427eb55b61c2febb0dc6b47d02ca6b SHA512 cd6acf817c548ef518f0e64172f8263b181eddeaf0cbe527b30a5db9ecf0f985b76a6d9c28a54ae7a743debb844c0c75781ebcdf81eb478f2bd67b81d1e3f847 -DIST setuptools-59.3.0.tar.gz 2281438 BLAKE2B 10e01103d4f2e115cb29da3f412837e0f62cd30b35d8c4e26faf2d30ad0e2d8a4b9706137490241437b969ff21d4c88b13f2fccf98f196f3fd8350a679233387 SHA512 d230ba5c7e718921b8f073a4ed3f1ccb6cbb4272f7787171bbfe20e9f37fbc6c77ba92d741cc99917cd59057e81740d2ddff27b5a87ebef2a54dd14ee3f9fbaf DIST setuptools-59.4.0.tar.gz 2281497 BLAKE2B 8267d6d4c373f44659b22155848fe064c7575cb74702ad77894adddcf05d805324bcd68505270bd05e81ec5702cb1dd47beec62de26f17a6459683df8cd1414b SHA512 bc7b1eb89c40ffe64b827bfbe4981dc157a7cdbd5924e53483ff69ad7e9613f6957bc36366d45c45e1e49f2d504a7b2d81677690722d4d1f1ab2e62be05b617f diff --git a/dev-python/setuptools/files/setuptools-58.2.0-fix-pypy3.8-install.patch b/dev-python/setuptools/files/setuptools-58.2.0-fix-pypy3.8-install.patch deleted file mode 100644 index 238bc47d3328..000000000000 --- a/dev-python/setuptools/files/setuptools-58.2.0-fix-pypy3.8-install.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 987edfa3265187a47b8688119943e7d96712d859 Mon Sep 17 00:00:00 2001 -From: Isuru Fernando <[email protected]> -Date: Tue, 21 Sep 2021 13:45:50 -0700 -Subject: [PATCH] Fix PyPy3.8 install locations - ---- - setuptools/_distutils/command/install.py | 26 +++++++++++++++++--------- - 1 file changed, 17 insertions(+), 9 deletions(-) - -diff --git a/setuptools/_distutils/command/install.py b/setuptools/_distutils/command/install.py -index 866e2d5..e98f049 100644 ---- a/setuptools/_distutils/command/install.py -+++ b/setuptools/_distutils/command/install.py -@@ -29,16 +29,16 @@ - - INSTALL_SCHEMES = { - 'unix_prefix': { -- 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/$platlibdir/python$py_version_short/site-packages', -- 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', -+ 'purelib': '$base/lib/$implementation_lower$py_version_short/site-packages', -+ 'platlib': '$platbase/$platlibdir/$implementation_lower$py_version_short/site-packages', -+ 'headers': '$base/include/$implementation_lower$py_version_short$abiflags/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', - }, - 'unix_home': { -- 'purelib': '$base/lib/python', -- 'platlib': '$base/$platlibdir/python', -- 'headers': '$base/include/python/$dist_name', -+ 'purelib': '$base/lib/$implementation_lower', -+ 'platlib': '$base/$platlibdir/$implementation_lower', -+ 'headers': '$base/include/$implementation_lower/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', - }, -@@ -64,8 +64,8 @@ - INSTALL_SCHEMES['nt_user'] = { - 'purelib': '$usersite', - 'platlib': '$usersite', -- 'headers': '$userbase/Python$py_version_nodot/Include/$dist_name', -- 'scripts': '$userbase/Python$py_version_nodot/Scripts', -+ 'headers': '$userbase/$implementation$py_version_nodot/Include/$dist_name', -+ 'scripts': '$userbase/$implementation$py_version_nodot/Scripts', - 'data' : '$userbase', - } - -@@ -73,7 +73,7 @@ - 'purelib': '$usersite', - 'platlib': '$usersite', - 'headers': -- '$userbase/include/python$py_version_short$abiflags/$dist_name', -+ '$userbase/include/$implementation_lower$py_version_short$abiflags/$dist_name', - 'scripts': '$userbase/bin', - 'data' : '$userbase', - } -@@ -83,6 +83,12 @@ - # and to SCHEME_KEYS here. - SCHEME_KEYS = ('purelib', 'platlib', 'headers', 'scripts', 'data') - -+def _get_implementation(): -+ if hasattr(sys, 'pypy_version_info'): -+ return 'PyPy' -+ else: -+ return 'Python' -+ - - class install(Command): - -@@ -313,6 +319,8 @@ def finalize_options(self): - 'exec_prefix': exec_prefix, - 'abiflags': abiflags, - 'platlibdir': getattr(sys, 'platlibdir', 'lib'), -+ 'implementation_lower': _get_implementation().lower(), -+ 'implementation': _get_implementation(), - } - - if HAS_USER_SITE: \ No newline at end of file diff --git a/dev-python/setuptools/setuptools-58.2.0-r1.ebuild b/dev-python/setuptools/setuptools-58.2.0-r1.ebuild deleted file mode 100644 index 2d78feac9fde..000000000000 --- a/dev-python/setuptools/setuptools-58.2.0-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 7 -- sys-apps/portage dep -EAPI=7 - -# Set to 'manual' to avoid triggering install QA check -DISTUTILS_USE_SETUPTOOLS=manual -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 multiprocessing - -CPY_PATCHSET="python-gentoo-patches-3.10.0rc1" -DESCRIPTION="Collection of extensions to Distutils" -HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz"; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - $(python_gen_cond_dep ' - dev-python/jaraco-envs[${PYTHON_USEDEP}] - >=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-fixture-config[${PYTHON_USEDEP}] - dev-python/pytest-virtualenv[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - >=dev-python/virtualenv-20[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ' python3_{8..10} pypy3) - ) -" -PDEPEND=" - >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}] - dev-python/setuptools_scm[${PYTHON_USEDEP}]" - -# Force in-source build because build system modifies sources. -DISTUTILS_IN_SOURCE_BUILD=1 - -DOCS=( {CHANGES,README}.rst ) - -PATCHES=( - # https://github.com/pypa/distutils/pull/58 - "${FILESDIR}/${P}-fix-pypy3.8-install.patch" -) - -src_prepare() { - # apply distutils patches to the bundled distutils - pushd setuptools/_distutils >/dev/null || die - # TODO: distutils C++ patch? - eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch" - popd >/dev/null || die - - distutils-r1_src_prepare -} - -python_test() { - # keep in sync with python_gen_cond_dep above! - has "${EPYTHON}" python3.{8..10} pypy3 || continue - - distutils_install_for_testing - local EPYTEST_DESELECT=( - # network - setuptools/tests/test_distutils_adoption.py - 'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]' - # unhappy with pytest-xdist? - setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index - # TODO - setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts - ) - - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg - # It tries to sandbox the test in a tempdir - HOME="${PWD}" epytest \ - -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools -} - -python_install() { - export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 - distutils-r1_python_install -} diff --git a/dev-python/setuptools/setuptools-59.3.0.ebuild b/dev-python/setuptools/setuptools-59.3.0.ebuild deleted file mode 100644 index 8575f622e7c5..000000000000 --- a/dev-python/setuptools/setuptools-59.3.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 7 -- sys-apps/portage dep -EAPI=7 - -# Set to 'manual' to avoid triggering install QA check -DISTUTILS_USE_SETUPTOOLS=manual -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 multiprocessing - -CPY_PATCHSET="python-gentoo-patches-3.10.0_p1" -DESCRIPTION="Collection of extensions to Distutils" -HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - $(python_gen_cond_dep ' - dev-python/jaraco-envs[${PYTHON_USEDEP}] - >=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-fixture-config[${PYTHON_USEDEP}] - dev-python/pytest-virtualenv[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - >=dev-python/virtualenv-20[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ' python3_{8..10} pypy3) - ) -" -PDEPEND=" - >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}] - dev-python/setuptools_scm[${PYTHON_USEDEP}]" - -# Force in-source build because build system modifies sources. -DISTUTILS_IN_SOURCE_BUILD=1 - -DOCS=( {CHANGES,README}.rst ) - -src_prepare() { - # apply distutils patches to the bundled distutils - pushd setuptools/_distutils >/dev/null || die - # TODO: distutils C++ patch? - eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch" - popd >/dev/null || die - - distutils-r1_src_prepare -} - -python_test() { - # keep in sync with python_gen_cond_dep above! - has "${EPYTHON}" python3.{8..10} pypy3 || continue - - distutils_install_for_testing - local EPYTEST_DESELECT=( - # network - setuptools/tests/test_distutils_adoption.py - 'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]' - # unhappy with pytest-xdist? - setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index - # TODO - setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts - setuptools/tests/test_test.py::test_tests_are_run_once - ) - - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg - # It tries to sandbox the test in a tempdir - HOME="${PWD}" epytest \ - -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools -} - -python_install() { - export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 - distutils-r1_python_install -}
