From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: jsnow@redhat.com, philmd@linaro.org, berrange@redhat.com
Subject: [PATCH v2 11/27] mkvenv: work around broken pip installations on Debian 10
Date: Tue, 16 May 2023 12:58:52 +0200 [thread overview]
Message-ID: <20230516105908.527838-11-pbonzini@redhat.com> (raw)
In-Reply-To: <20230516105908.527838-1-pbonzini@redhat.com>
From: John Snow <jsnow@redhat.com>
This is a workaround intended for Debian 10, where the debian-patched
pip does not function correctly if accessed from within a virtual
environment.
We don't support Debian 10 as a build platform any longer, though we do
still utilize it for our build-tricore-softmmu CI test. It's also
possible that this bug might appear on other derivative platforms and
this workaround may prove useful.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20230511035435.734312-11-jsnow@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
python/scripts/mkvenv.py | 72 +++++++++++++++++++++++++++++++---------
1 file changed, 56 insertions(+), 16 deletions(-)
diff --git a/python/scripts/mkvenv.py b/python/scripts/mkvenv.py
index 7fc30dc1b3e8..b310f6c0531e 100644
--- a/python/scripts/mkvenv.py
+++ b/python/scripts/mkvenv.py
@@ -161,7 +161,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
):
kwargs["with_pip"] = False
else:
- check_ensurepip()
+ check_ensurepip(suggest_remedy=True)
super().__init__(*args, **kwargs)
@@ -266,7 +266,7 @@ def need_ensurepip() -> bool:
return True
-def check_ensurepip() -> None:
+def check_ensurepip(prefix: str = "", suggest_remedy: bool = False) -> None:
"""
Check that we have ensurepip.
@@ -277,12 +277,15 @@ def check_ensurepip() -> None:
"Python's ensurepip module is not found.\n"
"It's normally part of the Python standard library, "
"maybe your distribution packages it separately?\n"
- "Either install ensurepip, or alleviate the need for it in the "
- "first place by installing pip and setuptools for "
- f"'{sys.executable}'.\n"
- "(Hint: Debian puts ensurepip in its python3-venv package.)"
+ "(Debian puts ensurepip in its python3-venv package.)\n"
)
- raise Ouch(msg)
+ if suggest_remedy:
+ msg += (
+ "Either install ensurepip, or alleviate the need for it in the"
+ " first place by installing pip and setuptools for "
+ f"'{sys.executable}'.\n"
+ )
+ raise Ouch(prefix + msg)
# ensurepip uses pyexpat, which can also go missing on us:
if not find_spec("pyexpat"):
@@ -290,12 +293,15 @@ def check_ensurepip() -> None:
"Python's pyexpat module is not found.\n"
"It's normally part of the Python standard library, "
"maybe your distribution packages it separately?\n"
- "Either install pyexpat, or alleviate the need for it in the "
- "first place by installing pip and setuptools for "
- f"'{sys.executable}'.\n\n"
- "(Hint: NetBSD's pkgsrc debundles this to e.g. 'py310-expat'.)"
+ "(NetBSD's pkgsrc debundles this to e.g. 'py310-expat'.)\n"
)
- raise Ouch(msg)
+ if suggest_remedy:
+ msg += (
+ "Either install pyexpat, or alleviate the need for it in the "
+ "first place by installing pip and setuptools for "
+ f"'{sys.executable}'.\n"
+ )
+ raise Ouch(prefix + msg)
def make_venv( # pylint: disable=too-many-arguments
@@ -501,6 +507,38 @@ def _get_entry_points() -> Iterator[str]:
logger.debug("wrote console_script '%s'", filename)
+def checkpip() -> bool:
+ """
+ Debian10 has a pip that's broken when used inside of a virtual environment.
+
+ We try to detect and correct that case here.
+ """
+ try:
+ # pylint: disable=import-outside-toplevel,unused-import,import-error
+ # pylint: disable=redefined-outer-name
+ import pip._internal # type: ignore # noqa: F401
+
+ logger.debug("pip appears to be working correctly.")
+ return False
+ except ModuleNotFoundError as exc:
+ if exc.name == "pip._internal":
+ # Uh, fair enough. They did say "internal".
+ # Let's just assume it's fine.
+ return False
+ logger.warning("pip appears to be malfunctioning: %s", str(exc))
+
+ check_ensurepip("pip appears to be non-functional, and ")
+
+ logger.debug("Attempting to repair pip ...")
+ subprocess.run(
+ (sys.executable, "-m", "ensurepip"),
+ stdout=subprocess.DEVNULL,
+ check=True,
+ )
+ logger.debug("Pip is now (hopefully) repaired!")
+ return True
+
+
def pkgname_from_depspec(dep_spec: str) -> str:
"""
Parse package name out of a PEP-508 depspec.
@@ -741,10 +779,12 @@ def post_venv_setup() -> None:
This is intended to be run *inside the venv* after it is created.
"""
logger.debug("post_venv_setup()")
- # Generate a 'pip' script so the venv is usable in a normal
- # way from the CLI. This only happens when we inherited pip from a
- # parent/system-site and haven't run ensurepip in some way.
- generate_console_scripts(["pip"])
+ # Test for a broken pip (Debian 10 or derivative?) and fix it if needed
+ if not checkpip():
+ # Finally, generate a 'pip' script so the venv is usable in a normal
+ # way from the CLI. This only happens when we inherited pip from a
+ # parent/system-site and haven't run ensurepip in some way.
+ generate_console_scripts(["pip"])
def _add_create_subcommand(subparsers: Any) -> None:
--
2.40.1
next prev parent reply other threads:[~2023-05-16 11:00 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-16 10:58 [PATCH v2 01/27] python: shut up "pip install" during "make check-minreqs" Paolo Bonzini
2023-05-16 10:58 ` [PATCH v2 02/27] python: update pylint configuration Paolo Bonzini
2023-05-16 10:58 ` [PATCH v2 03/27] python: add mkvenv.py Paolo Bonzini
2023-05-16 10:58 ` [PATCH v2 04/27] mkvenv: add better error message for broken or missing ensurepip Paolo Bonzini
2023-05-16 10:58 ` [PATCH v2 05/27] mkvenv: add nested venv workaround Paolo Bonzini
2023-05-16 10:58 ` [PATCH v2 06/27] mkvenv: add ensure subcommand Paolo Bonzini
2023-05-25 20:42 ` John Snow
2023-05-16 10:58 ` [PATCH v2 07/27] mkvenv: add --diagnose option to explain "ensure" failures Paolo Bonzini
2023-05-16 18:27 ` John Snow
2023-05-16 10:58 ` [PATCH v2 08/27] mkvenv: add console script entry point generation Paolo Bonzini
2023-05-16 10:58 ` [PATCH v2 09/27] mkvenv: use pip's vendored distlib as a fallback Paolo Bonzini
2023-05-16 10:58 ` [PATCH v2 10/27] mkvenv: avoid ensurepip if pip is installed Paolo Bonzini
2023-05-16 10:58 ` Paolo Bonzini [this message]
2023-05-16 10:58 ` [PATCH v2 12/27] tests/docker: add python3-venv dependency Paolo Bonzini
2023-05-26 9:17 ` Philippe Mathieu-Daudé
2023-05-16 10:58 ` [PATCH v2 13/27] tests/vm: Configure netbsd to use Python 3.10 Paolo Bonzini
2023-05-26 9:15 ` Philippe Mathieu-Daudé
2023-05-16 10:58 ` [PATCH v2 14/27] tests/vm: add py310-expat to NetBSD Paolo Bonzini
2023-05-26 9:15 ` Philippe Mathieu-Daudé
2023-05-16 10:58 ` [PATCH v2 15/27] python: add vendor.py utility Paolo Bonzini
2023-05-16 10:58 ` [PATCH v2 16/27] configure: create a python venv unconditionally Paolo Bonzini
2023-05-16 10:58 ` [PATCH v2 17/27] python/wheels: add vendored meson package Paolo Bonzini
2023-05-16 10:58 ` [PATCH v2 18/27] configure: use 'mkvenv ensure meson' to bootstrap meson Paolo Bonzini
2023-05-16 10:59 ` [PATCH v2 19/27] qemu.git: drop meson git submodule Paolo Bonzini
2023-05-16 10:59 ` [PATCH v2 20/27] tests: Use configure-provided pyvenv for tests Paolo Bonzini
2023-05-16 10:59 ` [PATCH v2 21/27] configure: move --enable-docs and --disable-docs back to configure Paolo Bonzini
2023-05-16 10:59 ` [PATCH v2 22/27] configure: bootstrap sphinx with mkvenv Paolo Bonzini
2023-05-16 10:59 ` [PATCH v2 23/27] configure: add --enable-pypi and --disable-pypi Paolo Bonzini
2023-05-16 10:59 ` [PATCH v2 24/27] Python: Drop support for Python 3.6 Paolo Bonzini
2023-05-16 10:59 ` [PATCH v2 25/27] configure: Add courtesy hint to Python version failure message Paolo Bonzini
2023-05-16 10:59 ` [PATCH v2 26/27] mkvenv: mark command as required Paolo Bonzini
2023-05-16 10:59 ` [PATCH v2 27/27] python: bump some of the dependencies Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230516105908.527838-11-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=berrange@redhat.com \
--cc=jsnow@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).