| 1 |
commit: ce90f1cf81154f8c0dda353bf6a3ddeaf1249dc3 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 31 08:17:16 2022 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 31 08:31:26 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce90f1cf |
| 7 |
|
| 8 |
dev-python/pip: Fix accidentally installing virtualenv w/ USE=test |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/832402 |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-python/pip/pip-21.3.1-r1.ebuild | 2 ++ |
| 14 |
dev-python/pip/pip-22.0.1.ebuild | 2 ++ |
| 15 |
2 files changed, 4 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-python/pip/pip-21.3.1-r1.ebuild b/dev-python/pip/pip-21.3.1-r1.ebuild |
| 18 |
index 3516e72b4f8a..8b39334f4fc3 100644 |
| 19 |
--- a/dev-python/pip/pip-21.3.1-r1.ebuild |
| 20 |
+++ b/dev-python/pip/pip-21.3.1-r1.ebuild |
| 21 |
@@ -113,6 +113,8 @@ python_test() { |
| 22 |
pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die |
| 23 |
distutils_install_for_testing |
| 24 |
popd >/dev/null || die |
| 25 |
+ # prevent it from being installed |
| 26 |
+ rm -r "${BUILD_DIR}"/lib/virtualenv* || die |
| 27 |
|
| 28 |
local -x GENTOO_PIP_TESTING=1 \ |
| 29 |
PATH="${TEST_DIR}/scripts:${PATH}" \ |
| 30 |
|
| 31 |
diff --git a/dev-python/pip/pip-22.0.1.ebuild b/dev-python/pip/pip-22.0.1.ebuild |
| 32 |
index 598e0beb128f..48c8736f6a40 100644 |
| 33 |
--- a/dev-python/pip/pip-22.0.1.ebuild |
| 34 |
+++ b/dev-python/pip/pip-22.0.1.ebuild |
| 35 |
@@ -112,6 +112,8 @@ python_test() { |
| 36 |
pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die |
| 37 |
distutils_install_for_testing |
| 38 |
popd >/dev/null || die |
| 39 |
+ # prevent it from being installed |
| 40 |
+ rm -r "${BUILD_DIR}"/lib/virtualenv* || die |
| 41 |
|
| 42 |
local -x GENTOO_PIP_TESTING=1 \ |
| 43 |
PATH="${TEST_DIR}/scripts:${PATH}" \ |
Archives