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 3FCFE158088 for ; Mon, 31 Jan 2022 08:32:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6AB102BC031; Mon, 31 Jan 2022 08:32:38 +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 03B352BC031 for ; Mon, 31 Jan 2022 08:32:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A3863432E2 for ; Mon, 31 Jan 2022 08:32:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3AB7E272 for ; Mon, 31 Jan 2022 08:32:35 +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: <1643617886.ce90f1cf81154f8c0dda353bf6a3ddeaf1249dc3.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pip/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pip/pip-21.3.1-r1.ebuild dev-python/pip/pip-22.0.1.ebuild X-VCS-Directories: dev-python/pip/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ce90f1cf81154f8c0dda353bf6a3ddeaf1249dc3 X-VCS-Branch: master Date: Mon, 31 Jan 2022 08:32:35 +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: b4e852a4-67de-4dbd-b0bd-153ba932db15 X-Archives-Hash: 6c91da05b8c0f5d2dfdd1b48a7cd29d5 commit: ce90f1cf81154f8c0dda353bf6a3ddeaf1249dc3 Author: Michał Górny gentoo org> AuthorDate: Mon Jan 31 08:17:16 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jan 31 08:31:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce90f1cf dev-python/pip: Fix accidentally installing virtualenv w/ USE=test Closes: https://bugs.gentoo.org/832402 Signed-off-by: Michał Górny gentoo.org> dev-python/pip/pip-21.3.1-r1.ebuild | 2 ++ dev-python/pip/pip-22.0.1.ebuild | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dev-python/pip/pip-21.3.1-r1.ebuild b/dev-python/pip/pip-21.3.1-r1.ebuild index 3516e72b4f8a..8b39334f4fc3 100644 --- a/dev-python/pip/pip-21.3.1-r1.ebuild +++ b/dev-python/pip/pip-21.3.1-r1.ebuild @@ -113,6 +113,8 @@ python_test() { pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die distutils_install_for_testing popd >/dev/null || die + # prevent it from being installed + rm -r "${BUILD_DIR}"/lib/virtualenv* || die local -x GENTOO_PIP_TESTING=1 \ PATH="${TEST_DIR}/scripts:${PATH}" \ diff --git a/dev-python/pip/pip-22.0.1.ebuild b/dev-python/pip/pip-22.0.1.ebuild index 598e0beb128f..48c8736f6a40 100644 --- a/dev-python/pip/pip-22.0.1.ebuild +++ b/dev-python/pip/pip-22.0.1.ebuild @@ -112,6 +112,8 @@ python_test() { pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die distutils_install_for_testing popd >/dev/null || die + # prevent it from being installed + rm -r "${BUILD_DIR}"/lib/virtualenv* || die local -x GENTOO_PIP_TESTING=1 \ PATH="${TEST_DIR}/scripts:${PATH}" \