From fc2f1018fc323ef2c6572734a9b130427cba76a6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Nov 2021 06:47:15 +0000 Subject: gentoo resync : 03.11.2021 --- dev-python/setuptools/Manifest | 3 +- .../setuptools-58.2.0-fix-pypy3.8-install.patch | 78 +++++++++++++++++++ dev-python/setuptools/setuptools-58.2.0-r1.ebuild | 91 ++++++++++++++++++++++ dev-python/setuptools/setuptools-58.2.0.ebuild | 86 -------------------- 4 files changed, 171 insertions(+), 87 deletions(-) create mode 100644 dev-python/setuptools/files/setuptools-58.2.0-fix-pypy3.8-install.patch create mode 100644 dev-python/setuptools/setuptools-58.2.0-r1.ebuild delete mode 100644 dev-python/setuptools/setuptools-58.2.0.ebuild (limited to 'dev-python/setuptools') diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index 3dadc9e83464..76b2b740caa0 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -1,7 +1,8 @@ AUX setuptools-57.5.0-syntaxerror.patch 1364 BLAKE2B ce5928c3ed54bb2f2211f5bc6c57b35e7baeefa634e008ed84c48022dd74f4db663cfc588743b4ba217e4bf33e1467f4010994a8f89029ff193182658158dacf SHA512 2c126cecc92550b15b990e7eb44c584cd141a5a60f1b96783af72889ed7fed5d6de16ccd53970eef945114d530c6544e71b2e69dc2218f6ad32ffe8942bebb6e +AUX setuptools-58.2.0-fix-pypy3.8-install.patch 3172 BLAKE2B 238ff186cc10426c8e7a5bbd123ce5d151c136e0edd32b0853bce20a73640a2d8085648160017d0e963a4e5b8e6f23fb3a3cde4ae15c3a566fe83dc7d8f47c10 SHA512 1cd5ddd943b7b6cef873314f9eed8df4f596a6b9e1d119969eb724b16ff530f0319fadea15b666d3c2a6efc75456efebed5361e59da1775cebfd7d1b277bcd52 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 EBUILD setuptools-57.5.0.ebuild 2973 BLAKE2B 3442ccf93ba5569395c7798e24b891c1260aa71117e684daf82ac7768eae617476867b90d548d9a537a1ed4127a9e7b42931318be71d66ae9b8d0d81e078e11d SHA512 89a2e9ccdbd3671e4ecf1a6f93934c729e761e956ac5e30265afed687a364145dbf79193b16e8f846f8bda5523e22ba4b4bf5277b2d9b3fdb1eea2346eec2789 -EBUILD setuptools-58.2.0.ebuild 2888 BLAKE2B 44a2275c680e522e300006dbbb0caedfb93262f7ef37288af55f63f86f92b26ecf8a0fc032461561d96bd50e698f7e2741acfc6c2fa3a504b5b71dffb023c186 SHA512 2fceb8e1e5f3f80be236d8379b6b8608ccf740d9a9ae07fa7d86522863335bb7b0057f6240af13c57162438a662e62f8d65a18be3e0e5c6080d13723c07b2bb1 +EBUILD setuptools-58.2.0-r1.ebuild 2992 BLAKE2B bfe4122af3be5ef4e608f1dd67bf4b66db1fc2e20e5bd1ee56fef9247819b6837739e5f46014f171929bff3ada2a47581ed60f7416f25d9d87247509701cd94a SHA512 4c5801858bed2125665923a11ee076db68809b24903fb0ffb46e0dca53af30fa72704ae08a6b105bdc74483ad32cabd3c30d08ffc776887d1e6fa5ea56983a22 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319 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 new file mode 100644 index 000000000000..238bc47d3328 --- /dev/null +++ b/dev-python/setuptools/files/setuptools-58.2.0-fix-pypy3.8-install.patch @@ -0,0 +1,78 @@ +From 987edfa3265187a47b8688119943e7d96712d859 Mon Sep 17 00:00:00 2001 +From: Isuru Fernando +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 new file mode 100644 index 000000000000..2d78feac9fde --- /dev/null +++ b/dev-python/setuptools/setuptools-58.2.0-r1.ebuild @@ -0,0 +1,91 @@ +# 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-58.2.0.ebuild b/dev-python/setuptools/setuptools-58.2.0.ebuild deleted file mode 100644 index 13e77de865de..000000000000 --- a/dev-python/setuptools/setuptools-58.2.0.ebuild +++ /dev/null @@ -1,86 +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 ) - -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 -} -- cgit v1.2.3