* [gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/, profiles/
@ 2021-12-20 8:40 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2021-12-20 8:40 UTC (permalink / raw
To: gentoo-commits
commit: ff0e868c61c050f027a1b39047a57d9f1456ee80
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 20 08:18:30 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 08:40:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff0e868c
dev-python/setuptools: Bump to 60.0.0
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/setuptools/Manifest | 1 +
dev-python/setuptools/setuptools-60.0.0.ebuild | 87 ++++++++++++++++++++++++++
profiles/package.mask | 5 ++
3 files changed, 93 insertions(+)
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 33c76cdad19e..c6b242780910 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -6,3 +6,4 @@ DIST setuptools-59.4.0.tar.gz 2281497 BLAKE2B 8267d6d4c373f44659b22155848fe064c7
DIST setuptools-59.5.0.tar.gz 2281671 BLAKE2B 51b3435a1d7962a06f7cf07c31487a1404274a54a1fae0567c3953686cbf3b3160327a56c599e80ce70fe8f56dc817fc76d0e4371d3622b5c6235b0fdc555980 SHA512 2ad0aa7c05d9664d0bdc17d93ba518903f14f0e8fe568bcc4615f8a651e3e35843d2747200e20a796f250f1bcebfa057c94b7942875aa1badd770ca12e847c32
DIST setuptools-59.6.0.tar.gz 2281973 BLAKE2B 1e7ffc94626684f7e82a1bbba14889af052898f87f79205618fb76d78252397d3fb555778cb3920d2eed55bc1ee2c95ceec9206940269a4ba35b3bc44eb91226 SHA512 25472ec7c167e07113c6645880952458969b146766b64224ec8f40dfc2a29b23e47104b63e806292ec81ee4e9dbbdc4663228f39b4412b586cba644f69b52309
DIST setuptools-59.8.0.tar.gz 2282358 BLAKE2B 2f1b49285fc70420e24f958c4955200ef0407a7f3aa52fd581a165fd47c7bbde8366c26963f1bbb36f0f77797c12cbb9016fdc69e1a5cc696bb67aacca16d140 SHA512 d906558b498bda8abf28831224502c6f0290a4cdbf087fe07af8321dba3dfd1e19fa5b4a820033e54c4561b82ea8ec54c287b4fd657892ed28c2a7de91a9107e
+DIST setuptools-60.0.0.tar.gz 2282339 BLAKE2B ad9a78df348c71d4374ccd773495cc3bfd6d02c214a327eece5daea06538c6a7a55975b22175afb6e67692a0945a7d48cd7b317040c7b5c4878a030505d5dbb1 SHA512 088c3dc38485ca16441d38e3404bce7d822f3ef8e48588101e9e93209905d8b1e1676de1131e2fd993a95caed0fcb3681386fbb7b679712ad0632cdbbcc04f51
diff --git a/dev-python/setuptools/setuptools-60.0.0.ebuild b/dev-python/setuptools/setuptools-60.0.0.ebuild
new file mode 100644
index 000000000000..8575f622e7c5
--- /dev/null
+++ b/dev-python/setuptools/setuptools-60.0.0.ebuild
@@ -0,0 +1,87 @@
+# 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
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index 713312bc2583..e5bdca55d285 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
#--- END OF EXAMPLES ---
+# Michał Górny <mgorny@gentoo.org> (2021-12-20)
+# Switches from deprecated stdlib distutils to vendored distutils
+# by default. Masked for testing. See tracker bug #822354.
+>=dev-python/setuptools-60
+
# Jonas Stein <jstein@gentoo.org> (2021-12-20)
# Package is broken and obsolete.
# Removal on 2022-02-01. Bug #828875.
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/, profiles/
@ 2022-08-17 6:16 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2022-08-17 6:16 UTC (permalink / raw
To: gentoo-commits
commit: 342235d5014d6e6b144aa563c8b11ef2920464df
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 05:53:09 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 06:16:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=342235d5
dev-python/setuptools: Remove broken 65.0.0
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/setuptools/Manifest | 1 -
dev-python/setuptools/setuptools-65.0.0.ebuild | 127 -------------------------
profiles/package.mask | 6 --
3 files changed, 134 deletions(-)
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 0659fac66c5a..135486ef7eb1 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -4,5 +4,4 @@ DIST setuptools-63.4.1.tar.gz 2598515 BLAKE2B ae75b12d18e35c0d7d48c43eaf8f114daf
DIST setuptools-63.4.2.tar.gz 2600520 BLAKE2B e5cedf9f5e58044ec74e45b7232ef64680854ba7be8f2c22e33373c7a8f5fc80578f99c9103eb81bc609fef56021fc7a311b03682842facea019d14387031f89 SHA512 a9cb002f3c9fd3e8ed189f800c45a9ab7bc51640430585226f290c2d6b24655999fbe827ddcc30fdd7f8a6ebd5e87dfc085d2ae1efbf35968213bb7dc77eeaee
DIST setuptools-63.4.3.tar.gz 2600453 BLAKE2B 927be74bdc11271589134aca26849e61c5ae23d5780a57c96b9c4a9fe5f93e57fa8a80787c8db1c555f32fab1e007a956e91a374ed285db393e26d9486805ef9 SHA512 f19478921ffcf5441ec60a2af17c695456fee064f287e2130c4ff14d471a1124bd37104ad43adc7623ea0cba4ed170ed4aa37c6883aff8fd811ab960e6d12453
DIST setuptools-64.0.3.tar.gz 2631478 BLAKE2B ff21a4cf81aed36561ac5a0da7d44c1cbe714bbd39de30041c48134c8e1204ad9edcb74540c392e4f4cf01ea161ae0ca4bdc55319e015748069986f30aa2d337 SHA512 0333322479d40b9d30187bcbb3ceadc5dd5ef8a5dcbcebc75f451b9fea06a5b7ca5d5db44c39278d62e932df7f563578c86fcd2cab9a41000caf15374a5cf182
-DIST setuptools-65.0.0.tar.gz 2606434 BLAKE2B d19d07be44006f2393ed705dd545dd5aa0f3afbd3a9dc675809683e73c82ee32cb845d2ba3b37debeb3546c6cd1645aedb8b8e8c22583f2ae5aeaf2bef062ae5 SHA512 83344b925138fb64dd94c19469228357378c067cf16b9c8d56e800268daed0a6f72f3e80be15cfd77fe09fcae49bc31fc241c8126c0287e0f977a215e139b845
DIST setuptools-65.0.2.tar.gz 2619562 BLAKE2B e00e6ff7fd18c77c3924151bdbb40b36243b48eb389b67cee3279a82abd41943e08b4f8b7422edcce67b90e4c989fc170d96b140a18c78918ca7970039af8b29 SHA512 ccaf438b78a0d33ec4ec606f0fe64dcaf306dfe8935076b7534b984d0c0bfdf023d37a2b50e94572d54a5c8150e1458baabe811a4236410aedb75ee2a9215862
diff --git a/dev-python/setuptools/setuptools-65.0.0.ebuild b/dev-python/setuptools/setuptools-65.0.0.ebuild
deleted file mode 100644
index b79ed67ff041..000000000000
--- a/dev-python/setuptools/setuptools-65.0.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 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
-
-# please bump dev-python/ensurepip-wheels along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-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
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
- >=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
- >=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-21.3-r2[${PYTHON_USEDEP}]
- >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
- ' 3.8 3.9)
- $(python_gen_cond_dep '
- >=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
- ' 3.8)
-"
-BDEPEND="
- ${RDEPEND}
- >=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
- test? (
- $(python_gen_cond_dep '
- dev-python/build[${PYTHON_USEDEP}]
- >=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
- >=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
- >=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
- >=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- dev-python/pip-run[${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/tomli-w-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/virtualenv-20[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- ' "${PYTHON_TESTED[@]}")
- )
-"
-PDEPEND="
- >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
- local PATCHES=(
- # TODO: remove this when we're 100% PEP517 mode
- "${FILESDIR}"/setuptools-62.4.0-py-compile.patch
- )
-
- # remove bundled dependencies, setuptools will switch to system deps
- # automatically
- rm -r */_vendor || die
-
- # remove the ugly */extern hack that breaks on unvendored deps
- rm -r */extern || die
- find -name '*.py' -exec sed \
- -e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
- -i {} + || die
-
- distutils-r1_src_prepare
-
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
- local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
- if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
- return
- fi
-
- local EPYTEST_DESELECT=(
- # network
- # TODO: see if PRE_BUILT_SETUPTOOLS_* helps
- setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
- setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
- setuptools/tests/test_build_meta.py::test_legacy_editable_install
- setuptools/tests/test_distutils_adoption.py
- setuptools/tests/test_editable_install.py
- setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
- setuptools/tests/test_virtualenv.py::test_clean_env_install
- setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
- setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
- # TODO
- setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
- setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
- setuptools/tests/test_extern.py::test_distribution_picklable
- # expects bundled deps in virtualenv
- setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
- setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
- setuptools/tests/test_editable_install.py::test_editable_with_pyproject
- )
-
- epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index f7a340b72018..7e32e3892d3a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -70,12 +70,6 @@ sys-cluster/slurm
net-misc/calico-cni-plugin
net-misc/calicoctl
-# Sam James <sam@gentoo.org> (2022-08-14)
-# Removes MSVC functionality which some packages are relying on - they
-# need time to adapt to upstream setuptools changes.
-# bug #865183.
-=dev-python/setuptools-65.0.0
-
# John Helmert III <ajak@gentoo.org> (2022-08-14)
# Vulnerable and unmaintained for years, many open bugs, no revdeps
# Removal in 30 days, bug #631140
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-17 6:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-20 8:40 [gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/, profiles/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2022-08-17 6:16 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox