From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 14F61138350 for ; Mon, 10 Feb 2020 11:54:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F4E4E0932; Mon, 10 Feb 2020 11:54:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 02875E0932 for ; Mon, 10 Feb 2020 11:54:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2205634E9DC for ; Mon, 10 Feb 2020 11:54:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 61A30151 for ; Mon, 10 Feb 2020 11:54:22 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1581335656.06ae16e8a1f8aa17a41f31ca13e003ad04aee25a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/setuptools/Manifest dev-python/setuptools/setuptools-40.6.3.ebuild dev-python/setuptools/setuptools-45.0.0.ebuild dev-python/setuptools/setuptools-45.2.0.ebuild X-VCS-Directories: dev-python/setuptools/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 06ae16e8a1f8aa17a41f31ca13e003ad04aee25a X-VCS-Branch: master Date: Mon, 10 Feb 2020 11:54:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3b461e7a-2ec1-46a9-a777-92789c2ed091 X-Archives-Hash: 71f96c0d4190224b0d176e6a3255910d commit: 06ae16e8a1f8aa17a41f31ca13e003ad04aee25a Author: Michał Górny gentoo org> AuthorDate: Mon Feb 10 11:52:11 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Feb 10 11:54:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06ae16e8 dev-python/setuptools: Revert "Remove redundant versions" dev-python/cheroot requires old setuptools. Reverts: 052403d95f715f3c6ed273369a1331c5ef6a828f Signed-off-by: Michał Górny gentoo.org> dev-python/setuptools/Manifest | 2 ++ ...ools-45.2.0.ebuild => setuptools-40.6.3.ebuild} | 32 ++++++++++++++-------- ...ools-45.2.0.ebuild => setuptools-45.0.0.ebuild} | 9 ++++-- dev-python/setuptools/setuptools-45.2.0.ebuild | 3 -- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index 820a957bb55..6b18b818438 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -1,4 +1,6 @@ +DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c DIST setuptools-42.0.2.zip 858444 BLAKE2B 2b77dbeeb9a3b4138810a96fe7ac0a7800717b4b68d6e9db2d146ca176127d5bfd5e4ef07adfa98758f8c4d05396152ca08e1707caf3d91703c7b268bd291f28 SHA512 ab623fd69b92111d3ab19a3ad9de9c07b4316f4130f3db4068a436d3c13c971d97506f7307c9f64d9cc9ca24a5f3800b68748455e70418d0c0cd240c93ebae35 DIST setuptools-44.0.0.zip 858893 BLAKE2B 02ba2a838487ba9e80d9ca3b8598cecbec4d286f2734be439d2b73f3f7f0ca80e80ea71a0c2322093deb548503c82d6eb32b1585992979b053f14f49baa00baa SHA512 bb48e7763d258e654472bc416d16ec8708eefa95d1eb03cb6e81b623fd636cefc51a0bd67887084ab0214e256e2030a8f655184c3b59ad6937abab6a6178f3a1 +DIST setuptools-45.0.0.zip 859461 BLAKE2B 060cd64efb4ce67b931f5a5672222d2cb6e2bacb68edd50af5b14b8de95b5b9b7727b76b970084257ec9f3afdf4a7bf4acbc6223b6e355d033af3660dfe4f1aa SHA512 d912d093866dfcf7b0e22ba2df51ab0d366c52bd5796f0aedfa0b1848abc80a2e30035897b83bed08b67d9d7d0fce4b0c4981c2a80196b8637c19f34ec269645 DIST setuptools-45.1.0.zip 859771 BLAKE2B 585ff16f57709c4e8c74fe51442a21e052be9de20e2d8c619ebb7435764297bde9223f1a1660b4101b33241d0d6c308f3ccf7cd2404caa3652334a6d314eb53f SHA512 0f08a9b3fad131a99c44d3cdced21b533a30b5f8fd25d4ce21263f14ca6ed6a6789969b67757ea67c62b9cc189155b08c886c3706ce9f2fd30bd5537e1a4a7e1 DIST setuptools-45.2.0.zip 859896 BLAKE2B adc9ae0ebd6ec5c59b7541fa7cf2898f0b9082cdd9cb7ddb614d749deebda260da489890fae5da77c622d47dccdee14ac9d5bf3ddf4393ca43ff679bc726cea7 SHA512 0d1e1e5b4074bdf9b35515dc6d9b03476ebe48287f30ff81ebc23a4b6e12a9faabd6ced40642ca6c5f27030be0252f48f18e73eac3876a447b1c6d4320a50147 diff --git a/dev-python/setuptools/setuptools-45.2.0.ebuild b/dev-python/setuptools/setuptools-40.6.3.ebuild similarity index 65% copy from dev-python/setuptools/setuptools-45.2.0.ebuild copy to dev-python/setuptools/setuptools-40.6.3.ebuild index e9378e5d2c3..cda3f2830f2 100644 --- a/dev-python/setuptools/setuptools-45.2.0.ebuild +++ b/dev-python/setuptools/setuptools-40.6.3.ebuild @@ -1,31 +1,39 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=6 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) +PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 ) PYTHON_REQ_USE="xml(+)" inherit distutils-r1 +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/pypa/setuptools.git" + inherit git-r3 +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" + KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + 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}.zip" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" -BDEPEND=" +RDEPEND=" +" +DEPEND="${RDEPEND} app-arch/unzip test? ( - dev-python/mock[${PYTHON_USEDEP}] dev-python/pip[${PYTHON_USEDEP}] - >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}] + >=dev-python/pytest-3.1.0[${PYTHON_USEDEP}] dev-python/pytest-fixture-config[${PYTHON_USEDEP}] dev-python/pytest-virtualenv[${PYTHON_USEDEP}] + >=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}] dev-python/wheel[${PYTHON_USEDEP}] virtual/python-futures[${PYTHON_USEDEP}] ) @@ -39,22 +47,24 @@ DISTUTILS_IN_SOURCE_BUILD=1 DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) python_prepare_all() { + if [[ ${PV} == "9999" ]]; then + python_setup + ${EPYTHON} bootstrap.py || die + fi + # disable tests requiring a network connection rm setuptools/tests/test_packageindex.py || die # don't run integration tests rm setuptools/tests/test_integration.py || die - # avoid pointless dep on flake8 - sed -i -e 's:--flake8::' pytest.ini || die - distutils-r1_python_prepare_all } python_test() { # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg # It tries to sandbox the test in a tempdir - HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}" + HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}" } python_install() { diff --git a/dev-python/setuptools/setuptools-45.2.0.ebuild b/dev-python/setuptools/setuptools-45.0.0.ebuild similarity index 91% copy from dev-python/setuptools/setuptools-45.2.0.ebuild copy to dev-python/setuptools/setuptools-45.0.0.ebuild index e9378e5d2c3..b3c6db3ab76 100644 --- a/dev-python/setuptools/setuptools-45.2.0.ebuild +++ b/dev-python/setuptools/setuptools-45.0.0.ebuild @@ -38,6 +38,12 @@ DISTUTILS_IN_SOURCE_BUILD=1 DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) +PATCHES=( + # fix regression introduced by reinventing deprecated 'imp' + # https://github.com/pypa/setuptools/pull/1905 + "${FILESDIR}"/setuptools-42.0.0-imp-fix.patch +) + python_prepare_all() { # disable tests requiring a network connection rm setuptools/tests/test_packageindex.py || die @@ -45,9 +51,6 @@ python_prepare_all() { # don't run integration tests rm setuptools/tests/test_integration.py || die - # avoid pointless dep on flake8 - sed -i -e 's:--flake8::' pytest.ini || die - distutils-r1_python_prepare_all } diff --git a/dev-python/setuptools/setuptools-45.2.0.ebuild b/dev-python/setuptools/setuptools-45.2.0.ebuild index e9378e5d2c3..49e44b53174 100644 --- a/dev-python/setuptools/setuptools-45.2.0.ebuild +++ b/dev-python/setuptools/setuptools-45.2.0.ebuild @@ -45,9 +45,6 @@ python_prepare_all() { # don't run integration tests rm setuptools/tests/test_integration.py || die - # avoid pointless dep on flake8 - sed -i -e 's:--flake8::' pytest.ini || die - distutils-r1_python_prepare_all }