From 46eedbedafdb0040c37884982d4c775ce277fb7b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Oct 2021 10:22:14 +0100 Subject: gentoo resync : 20.10.2021 --- dev-python/setuptools/Manifest | 6 +- dev-python/setuptools/setuptools-57.4.0-r2.ebuild | 88 ----------------------- dev-python/setuptools/setuptools-57.5.0.ebuild | 2 +- dev-python/setuptools/setuptools-58.2.0.ebuild | 86 ++++++++++++++++++++++ 4 files changed, 90 insertions(+), 92 deletions(-) delete mode 100644 dev-python/setuptools/setuptools-57.4.0-r2.ebuild create 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 1c424535e125..3dadc9e83464 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -1,7 +1,7 @@ AUX setuptools-57.5.0-syntaxerror.patch 1364 BLAKE2B ce5928c3ed54bb2f2211f5bc6c57b35e7baeefa634e008ed84c48022dd74f4db663cfc588743b4ba217e4bf33e1467f4010994a8f89029ff193182658158dacf SHA512 2c126cecc92550b15b990e7eb44c584cd141a5a60f1b96783af72889ed7fed5d6de16ccd53970eef945114d530c6544e71b2e69dc2218f6ad32ffe8942bebb6e DIST python-gentoo-patches-3.10.0rc1.tar.xz 8112 BLAKE2B d6f9b44c5a231f447ffe3533afbcaffe0f3b8bdd5a6690f1854bd7e1199d036d11a4cf4abfae345a88c42740ccbd4b72e53cbe28aea1a5db39dda1e5bfd47229 SHA512 bba7045f56369ca0354a539f8478a1afed77dc89a9faf548a0cf8959d644360b0afc4f84b95151ebfc2a6553078322c7445073f7a4104e9cd639ccc86ad0f792 -DIST setuptools-57.4.0.tar.gz 2141309 BLAKE2B 89b386b6d5bbac61df400f60c91a0a9b9ee381aec7d2f65a856c317c7b0b5512c5e9aa8844c0e64f1840a8e954ae22ed542ad97a104d5416b1df2ac02351809b SHA512 7fcc297ea3e6310f2ec8ba5bf0d509e3f4acbce6bde7e5f0fe1b022c147cf88a047471bd4aa278724e86ebc6be800015fb935c7a31dbb6a0801a2d380ddd89f2 DIST setuptools-57.5.0.tar.gz 2141727 BLAKE2B 54c065e0bdcb0c3a0a76026d78ab26615e07ee013e684ef18c3731757a38efe38d21d4c99b687595873679d77ab8381cccc483847467c98eb7086d9cac5bd8ec SHA512 9dae7cbddcca0859d128f528232c2ab6baca2b4447bba129a7bbc014c98a8ecc866cc71c7e93900bb93ea4bbbe5e398c1c3b4a4867afb2caf2c38a2d5a46d67c -EBUILD setuptools-57.4.0-r2.ebuild 2909 BLAKE2B 13033ebb349f763c7901dd8f87268b54e54692acb244e3fa54a0abc0d7e2c0f54c36f58172a8985542e4f1cc35adb500c0c3fc8c5f456f760ec0cc9a078e5f54 SHA512 55889a71314f4748fdc6266111475bea568438da1f173d57761d569b5841c9c26ce4a85e105dc64d1f751f341c5a18f7468de2380ae3b77ed9d7c1b63b23ca57 -EBUILD setuptools-57.5.0.ebuild 2981 BLAKE2B 42149e1d1d273654b7b6c7c2a7da4904f294f28bd28c37358112c7d54a019ef9f05b5642407817f7b3e440020a8aad80d38b7ab37bba47c6b68cad5f44e871e9 SHA512 fe208e8166fb17a092f565eaafd63bb8a17470864aab03f5c077396c687f40e9ee4c2ccbb341f6668a9aa0172825a75abef76fe8f1ad3584e0033246fbd89f74 +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 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319 diff --git a/dev-python/setuptools/setuptools-57.4.0-r2.ebuild b/dev-python/setuptools/setuptools-57.4.0-r2.ebuild deleted file mode 100644 index c27ab3194b75..000000000000 --- a/dev-python/setuptools/setuptools-57.4.0-r2.ebuild +++ /dev/null @@ -1,88 +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 deselect=( - # network - 'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]' - setuptools/tests/test_distutils_adoption.py - # TODO - setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts - ) - [[ ${EPYTHON} == pypy3 ]] && deselect+=( - setuptools/tests/test_develop.py::TestDevelop::test_2to3_user_mode - ) - - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg - # It tries to sandbox the test in a tempdir - HOME="${PWD}" epytest ${deselect[@]/#/--deselect } \ - -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-57.5.0.ebuild b/dev-python/setuptools/setuptools-57.5.0.ebuild index ebe5023e2357..27e68a3d4830 100644 --- a/dev-python/setuptools/setuptools-57.5.0.ebuild +++ b/dev-python/setuptools/setuptools-57.5.0.ebuild @@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz 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" +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 )" diff --git a/dev-python/setuptools/setuptools-58.2.0.ebuild b/dev-python/setuptools/setuptools-58.2.0.ebuild new file mode 100644 index 000000000000..13e77de865de --- /dev/null +++ b/dev-python/setuptools/setuptools-58.2.0.ebuild @@ -0,0 +1,86 @@ +# 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