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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0CAFE15800F for ; Sat, 18 Feb 2023 07:03:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D58ABE085B; Sat, 18 Feb 2023 07:03:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA2EEE085B for ; Sat, 18 Feb 2023 07:03:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D0063340F64 for ; Sat, 18 Feb 2023 07:03:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B9F048C6 for ; Sat, 18 Feb 2023 07:03:07 +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: <1676703780.fb14e9aee78fe29a5f547a866d816b897f09a49a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pip/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pip/Manifest dev-python/pip/pip-23.0.1.ebuild X-VCS-Directories: dev-python/pip/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: fb14e9aee78fe29a5f547a866d816b897f09a49a X-VCS-Branch: master Date: Sat, 18 Feb 2023 07:03:07 +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: 8f1ebfca-3eb5-4749-b77f-6276d5961e02 X-Archives-Hash: faef80b5378690ac83cbb57150701768 commit: fb14e9aee78fe29a5f547a866d816b897f09a49a Author: Michał Górny gentoo org> AuthorDate: Sat Feb 18 06:19:37 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Feb 18 07:03:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb14e9ae dev-python/pip: Use wheel from dev-python/ensurepip-setuptools Signed-off-by: Michał Górny gentoo.org> dev-python/pip/Manifest | 1 - dev-python/pip/pip-23.0.1.ebuild | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index 119956953af1..db74b94b3188 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -2,7 +2,6 @@ DIST pip-22.3.1.gh.tar.gz 9326504 BLAKE2B b125599a9f77e49414dae13ca3fe0ac27c9b7e DIST pip-23.0.1.gh.tar.gz 9336422 BLAKE2B 1781b0340ba7f76299fa8e37f0509f15a08cc599d196c74b90a2cb79321de570240ed9f12bc64d45ede2182ec8a3eead44ce1b840eaa83931d089ecc07923203 SHA512 ed14ce37293e749b4fd93d7f93d81356c77428b1fb14dfd760b59aea720ebb3cce5a49c2d32ab600e73b37389937830ff4dee04750e83078c8ab9d57513f294c DIST pip-23.0.gh.tar.gz 9336486 BLAKE2B 693623292e498ec939ce931063bccc8079fc313a0a9f30d406a99a2084fcd84b5b5a17566602c53bb96090920bc2d0615f28b8f9c165022c2b0de62fa9355b21 SHA512 9b791ed15b4e5dd768351043929dc6ee18eeab251a26fb2b0d712dec578101f1620a13d5914d44f2761ecb95e64bc47e6b07096126404ca70345268028524d43 DIST setuptools-62.3.2-py3-none-any.whl 1225929 BLAKE2B 608952e201f749ebf557e3962ba9856d5bdcbc534f3a25598cab0d6c53282cfb3b9f007ba135497a8addf49db4c02bc4387c486d95a4529d01ce4114154ec28a SHA512 366d69dc44e326dd7549cdacd8dec481a14dce4feef4338adc38b9de5c4c338f04d61696e13ce8603be1315f2e8734100f92d3fe4b4b11843e19f550c9631978 -DIST setuptools-67.3.2-py3-none-any.whl 1085356 BLAKE2B 46528b14588df0b4301cbfb72d334f69b91b7d03e85866bd2d900364c784517d443bc9ce922f8e40681680662bc853ea60280250d2dbeb22f975c4bb1cbad67f SHA512 0f35fe23243852b5fb6ce3c1753993564cd258a504934a996d16110116a4e8e64c71f670fddf7cfd9daf4c6790423c9f1902e3226efc72303d2088aec7173fda DIST virtualenv-16.7.12.gh.tar.gz 8906590 BLAKE2B a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa SHA512 0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284 DIST wheel-0.38.4-py3-none-any.whl 36051 BLAKE2B 6c7d26fef5c6ec7987066d37579dd46a6b7704c4ec48c9f891cefdde5adf3a76934db9a912e6a05cc9d876782b7649110b814fd0df2e1af569f0336e47b3f850 SHA512 4d39de03dd3e87758de896c41240d58ed718e67042f33b0173446655e7c9d2c7d44f12e7a840058c93b9471c1492868ce38ef912d38e1bea723d082b329a4e4a diff --git a/dev-python/pip/pip-23.0.1.ebuild b/dev-python/pip/pip-23.0.1.ebuild index a204b06a3602..c0af4de71b0e 100644 --- a/dev-python/pip/pip-23.0.1.ebuild +++ b/dev-python/pip/pip-23.0.1.ebuild @@ -14,7 +14,6 @@ inherit bash-completion-r1 distutils-r1 multiprocessing # setuptools & wheel .whl files are required for testing, # the exact version is not very important. -SETUPTOOLS_WHL="setuptools-67.3.2-py3-none-any.whl" WHEEL_WHL="wheel-0.38.4-py3-none-any.whl" # upstream still requires virtualenv-16 for testing, we are now fetching # it directly to avoid blockers with virtualenv-20 @@ -29,7 +28,6 @@ HOMEPAGE=" SRC_URI=" https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz test? ( - https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL} https://files.pythonhosted.org/packages/py3/w/wheel/${WHEEL_WHL} https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz -> virtualenv-${VENV_PV}.gh.tar.gz @@ -50,6 +48,7 @@ BDEPEND=" ${RDEPEND} test? ( $(python_gen_cond_dep ' + dev-python/ensurepip-setuptools dev-python/freezegun[${PYTHON_USEDEP}] dev-python/pretend[${PYTHON_USEDEP}] dev-python/pytest-xdist[${PYTHON_USEDEP}] @@ -74,8 +73,9 @@ python_prepare_all() { distutils-r1_python_prepare_all if use test; then + local setuptools_whl=( "${BROOT}"/usr/lib/python/ensurepip/setuptools-*.whl ) mkdir tests/data/common_wheels/ || die - cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \ + cp "${setuptools_whl[@]}" "${DISTDIR}"/${WHEEL_WHL} \ tests/data/common_wheels/ || die fi }