[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v3 18/20] mkvenv: add diagnose() method for ensure() failures
From: |
John Snow |
Subject: |
[RFC PATCH v3 18/20] mkvenv: add diagnose() method for ensure() failures |
Date: |
Mon, 24 Apr 2023 16:02:46 -0400 |
This is a routine that is designed to print some usable info for human
beings back out to the terminal if/when "mkvenv ensure" fails to locate
or install a package during configure time, such as meson or sphinx.
Since we are requiring that "meson" and "sphinx" are installed to the
same Python environment as QEMU is configured to build with, this can
produce some surprising failures when things are mismatched. This method
is here to try and ease that sting by offering some actionable
diagnosis.
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/scripts/mkvenv.py | 153 +++++++++++++++++++++++++++++++++++----
1 file changed, 140 insertions(+), 13 deletions(-)
diff --git a/python/scripts/mkvenv.py b/python/scripts/mkvenv.py
index 937664ea9c..1bc4bc01b1 100644
--- a/python/scripts/mkvenv.py
+++ b/python/scripts/mkvenv.py
@@ -64,6 +64,7 @@
import os
from pathlib import Path
import re
+import shutil
import site
import stat
import subprocess
@@ -543,6 +544,103 @@ def checkpip() -> None:
logging.debug("Pip is now (hopefully) repaired!")
+def diagnose(
+ dep_spec: str,
+ online: bool,
+ wheels_dir: Optional[Union[str, Path]],
+ prog: Optional[str],
+) -> str:
+ """
+ Offer a summary to the user as to why a package failed to be installed.
+
+ :param dep_spec: The package we tried to ensure, e.g. 'meson>=0.61.5'
+ :param online: Did we allow PyPI access?
+ :param prog:
+ Optionally, a shell program name that can be used as a
+ bellwether to detect if this program is installed elsewhere on
+ the system. This is used to offer advice when a program is
+ detected for a different python version.
+ :param wheels_dir:
+ Optionally, a directory that was searched for vendored packages.
+ """
+ # pylint: disable=too-many-branches
+
+ # Parse name out of PEP-508 depspec.
+ # See https://peps.python.org/pep-0508/#names
+ match = re.match(
+ r"^([A-Z0-9]([A-Z0-9._-]*[A-Z0-9])?)", dep_spec, re.IGNORECASE
+ )
+ if not match:
+ raise ValueError(
+ f"dep_spec '{dep_spec}'"
+ " does not appear to contain a valid package name"
+ )
+ pkg_name = match.group(0)
+ pkg_version = None
+
+ has_importlib = False
+ try:
+ # Python 3.8+ stdlib
+ # pylint: disable=import-outside-toplevel
+ from importlib.metadata import PackageNotFoundError, version
+
+ has_importlib = True
+ try:
+ pkg_version = version(pkg_name)
+ except PackageNotFoundError:
+ pass
+ except ModuleNotFoundError:
+ pass
+
+ lines = []
+
+ if pkg_version:
+ lines.append(
+ f"Python package '{pkg_name}' version '{pkg_version}' was found,"
+ " but isn't suitable."
+ )
+ elif has_importlib:
+ lines.append(
+ f"Python package '{pkg_name}' was not found nor installed."
+ )
+ else:
+ lines.append(
+ f"Python package '{pkg_name}' is either not found or"
+ " not a suitable version."
+ )
+
+ if wheels_dir:
+ lines.append(
+ "No suitable version found in, or failed to install from"
+ f" '{wheels_dir}'."
+ )
+ else:
+ lines.append("No local package directory was searched.")
+
+ if online:
+ lines.append("A suitable version could not be obtained from PyPI.")
+ else:
+ lines.append(
+ "mkvenv was configured to operate offline and did not check PyPI."
+ )
+
+ if prog and not pkg_version:
+ which = shutil.which(prog)
+ if which:
+ pypath = Path(sys.executable).resolve()
+ lines.append(
+ f"'{prog}' was detected on your system at '{which}', "
+ f"but the Python package '{pkg_name}' was not found by this "
+ f"Python interpreter ('{pypath}'). "
+ f"Typically this means that '{prog}' has been installed "
+ "against a different Python interpreter on your system."
+ )
+
+ lines = [f" • {line}" for line in lines]
+ lines.insert(0, f"Could not ensure availability of '{dep_spec}':")
+ return os.linesep.join(lines)
+
+
def pip_install(
args: Sequence[str],
online: bool = False,
@@ -573,23 +671,11 @@ def pip_install(
subprocess.run(full_args, check=True)
-def ensure(
+def _do_ensure(
dep_spec: str,
online: bool = False,
wheels_dir: Optional[Union[str, Path]] = None,
) -> None:
- """
- Use pip to ensure we have the package specified by @dep_spec.
-
- If the package is already installed, do nothing. If online and
- wheels_dir are both provided, prefer packages found in wheels_dir
- first before connecting to PyPI.
-
- :param dep_spec:
- A PEP 508 dependency specification. e.g. 'meson>=0.61.5'.
- :param online: If True, fall back to PyPI.
- :param wheels_dir: If specified, search this path for packages.
- """
# This first install command will:
# (A) Do nothing, if we already have a suitable package.
# (B) Install the package from vendored source, if possible.
@@ -603,11 +689,42 @@ def ensure(
# The package is missing or isn't a suitable version,
# and we weren't able to install a suitable vendored package.
if online:
+ logger.info("offline ensure failed, trying PyPI ...")
pip_install([dep_spec], online=True)
else:
raise
+def ensure(
+ dep_spec: str,
+ online: bool = False,
+ wheels_dir: Optional[Union[str, Path]] = None,
+ prog: Optional[str] = None,
+) -> None:
+ """
+ Use pip to ensure we have the package specified by @dep_spec.
+
+ If the package is already installed, do nothing. If online and
+ wheels_dir are both provided, prefer packages found in wheels_dir
+ first before connecting to PyPI.
+
+ :param dep_spec:
+ A PEP 508 dependency specification. e.g. 'meson>=0.61.5'.
+ :param online: If True, fall back to PyPI.
+ :param wheels_dir: If specified, search this path for packages.
+ :param prog:
+ If specified, use this program name for error diagnostics that will
+ be presented to the user. e.g., 'sphinx-build' can be used as a
+ bellwether for the presence of 'sphinx'.
+ """
+ print(f"MKVENV ensure {dep_spec}", file=sys.stderr)
+ try:
+ _do_ensure(dep_spec, online, wheels_dir)
+ except subprocess.CalledProcessError as exc:
+ # Well, that's not good.
+ raise Ouch(diagnose(dep_spec, online, wheels_dir, prog)) from exc
+
+
def post_venv_setup(bin_path: str, packages: Sequence[str] = ()) -> None:
"""
This is intended to be run *inside the venv* after it is created.
@@ -671,6 +788,15 @@ def _add_ensure_subcommand(subparsers: Any) -> None:
action="store",
help="Path to vendored packages where we may install from.",
)
+ subparser.add_argument(
+ "--diagnose",
+ type=str,
+ action="store",
+ help=(
+ "Name of a shell utility to use for "
+ "diagnostics if this command fails."
+ ),
+ )
subparser.add_argument(
"dep_spec",
type=str,
@@ -727,6 +853,7 @@ def _normalize_gen() -> None:
dep_spec=args.dep_spec,
online=args.online,
wheels_dir=args.dir,
+ prog=args.diagnose,
)
logger.debug("mkvenv.py %s: exiting", args.command)
except Ouch as exc:
--
2.39.2
- [RFC PATCH v3 12/20] scripts/make-release: download meson==0.61.5 .whl, (continued)
- [RFC PATCH v3 01/20] python: update pylint configuration, John Snow, 2023/04/24
- [RFC PATCH v3 16/20] tests: Use configure-provided pyvenv for tests, John Snow, 2023/04/24
- [RFC PATCH v3 17/20] configure: move --enable-docs and --disable-docs back to configure, John Snow, 2023/04/24
- [RFC PATCH v3 19/20] configure: use --diagnose option with meson ensure, John Snow, 2023/04/24
- [RFC PATCH v3 18/20] mkvenv: add diagnose() method for ensure() failures,
John Snow <=
- [RFC PATCH v3 20/20] configure: bootstrap sphinx with mkvenv, John Snow, 2023/04/24
- Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, Daniel P . Berrangé, 2023/04/25
- Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, John Snow, 2023/04/25
- Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, John Snow, 2023/04/25
- Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, Daniel P . Berrangé, 2023/04/25
- Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, John Snow, 2023/04/25
- Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, Daniel P . Berrangé, 2023/04/26
- Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, Paolo Bonzini, 2023/04/26
- Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, Daniel P . Berrangé, 2023/04/25
Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, Paolo Bonzini, 2023/04/26