On Tue, May 16, 2023 at 6:59 AM Paolo Bonzini <pbonz...@redhat.com> wrote:
>
> From: John Snow <js...@redhat.com>
>
> This command is to be used to add various packages (or ensure they're
> already present) into the configure-provided venv in a modular fashion.
>
> Examples:
>
> mkvenv ensure --online --dir "${source_dir}/python/wheels/" "meson>=0.61.5"
> mkvenv ensure --online "sphinx>=1.6.0"
> mkvenv ensure "qemu.qmp==0.0.2"
>
> It's designed to look for packages in three places, in order:
>
> (1) In system packages, if the version installed is already good
> enough. This way your distribution-provided meson, sphinx, etc are
> always used as first preference.
>
> (2) In a vendored packages directory. Here I am suggesting
> qemu.git/python/wheels/ as that directory. This is intended to serve as
> a replacement for vendoring the meson source for QEMU tarballs. It is
> also highly likely to be extremely useful for packaging the "qemu.qmp"
> package in source distributions for platforms that do not yet package
> qemu.qmp separately.
>
> (3) Online, via PyPI, ***only when "--online" is passed***. This is only
> ever used as a fallback if the first two sources do not have an
> appropriate package that meets the requirement. The ability to build
> QEMU and run tests *completely offline* is not impinged.
>
I should point out that the commit message here is no longer true,
this order isn't explicitly maintained, because:
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
> Signed-off-by: John Snow <js...@redhat.com>
> Message-Id: <20230511035435.734312-7-js...@redhat.com>
> [Use distlib to lookup distributions. - Paolo]
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
> ---
> python/scripts/mkvenv.py | 135 ++++++++++++++++++++++++++++++++++++++-
> python/setup.cfg | 10 +++
> python/tests/minreqs.txt | 3 +
> 3 files changed, 145 insertions(+), 3 deletions(-)
>
> diff --git a/python/scripts/mkvenv.py b/python/scripts/mkvenv.py
> index 2a3d73a51db4..fd4b62c70ffa 100644
> --- a/python/scripts/mkvenv.py
> +++ b/python/scripts/mkvenv.py
> @@ -11,6 +11,7 @@
> Commands:
> command Description
> create create a venv
> + ensure Ensure that the specified package is installed.
>
> --------------------------------------------------
>
> @@ -22,6 +23,18 @@
> options:
> -h, --help show this help message and exit
>
> +--------------------------------------------------
> +
> +usage: mkvenv ensure [-h] [--online] [--dir DIR] dep_spec...
> +
> +positional arguments:
> + dep_spec PEP 508 Dependency specification, e.g. 'meson>=0.61.5'
> +
> +options:
> + -h, --help show this help message and exit
> + --online Install packages from PyPI, if necessary.
> + --dir DIR Path to vendored packages where we may install from.
> +
> """
>
> # Copyright (C) 2022-2023 Red Hat, Inc.
> @@ -43,8 +56,17 @@
> import sys
> import sysconfig
> from types import SimpleNamespace
> -from typing import Any, Optional, Union
> +from typing import (
> + Any,
> + Optional,
> + Sequence,
> + Union,
> +)
> import venv
> +import warnings
> +
> +import distlib.database
> +import distlib.version
>
>
> # Do not add any mandatory dependencies from outside the stdlib:
> @@ -309,6 +331,77 @@ def _stringify(data: Union[str, bytes]) -> str:
> print(builder.get_value("env_exe"))
>
>
> +def pip_install(
> + args: Sequence[str],
> + online: bool = False,
> + wheels_dir: Optional[Union[str, Path]] = None,
> +) -> None:
> + """
> + Use pip to install a package or package(s) as specified in @args.
> + """
> + loud = bool(
> + os.environ.get("DEBUG")
> + or os.environ.get("GITLAB_CI")
> + or os.environ.get("V")
> + )
> +
> + full_args = [
> + sys.executable,
> + "-m",
> + "pip",
> + "install",
> + "--disable-pip-version-check",
> + "-v" if loud else "-q",
> + ]
> + if not online:
> + full_args += ["--no-index"]
> + if wheels_dir:
> + full_args += ["--find-links", f"file://{str(wheels_dir)}"]
> + full_args += list(args)
> + subprocess.run(
> + full_args,
> + check=True,
> + )
> +
> +
> +def ensure(
> + dep_specs: Sequence[str],
> + online: bool = False,
> + wheels_dir: Optional[Union[str, Path]] = None,
> +) -> None:
> + """
> + Use pip to ensure we have the package specified by @dep_specs.
> +
> + 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_specs:
> + PEP 508 dependency specifications. e.g. ['meson>=0.61.5'].
> + :param online: If True, fall back to PyPI.
> + :param wheels_dir: If specified, search this path for packages.
> + """
> + with warnings.catch_warnings():
> + warnings.filterwarnings(
> + "ignore", category=UserWarning, module="distlib"
> + )
> + dist_path = distlib.database.DistributionPath(include_egg=True)
> + absent = []
> + for spec in dep_specs:
> + matcher = distlib.version.LegacyMatcher(spec)
> + dist = dist_path.get_distribution(matcher.name)
> + if dist is None or not matcher.match(dist.version):
> + absent.append(spec)
> + else:
> + logger.info("found %s", dist)
> +
^ This change to determine if a package is installed or not instead of
using pip to figure it out for us, means that ...
> + if absent:
> + # Some packages are missing or aren't a suitable version,
> + # install a suitable (possibly vendored) package.
> + print(f"mkvenv: installing {', '.join(absent)}", file=sys.stderr)
> + pip_install(args=absent, online=online, wheels_dir=wheels_dir)
> +
^ a single invocation to pip will actually consider both online and
offline sources simultaneously, and chooses the "best version" between
all sources, with no weighting or preference given to the offline
source.
The only way to prefer an offline source to the exclusion of an online
one is with two separate pip_install invocations; so a suitable patch
here (sans some error management) might be:
if wheels_dir and online:
try:
pip_install(args=absent, wheels_dir)
return
except CalledProcessError:
pass
pip_install(args=absent, online=online, wheels_dir=wheels_dir)
It *may* be a good idea to implement this so that a meson release in
the middle of an RC freeze does not accidentally change the build
process for a large number of people all at once - It's a risk that
still exists with e.g. Fedora updates et al, but generally downstream
distros lag behind PyPI and we usually have lead time to work to
integrate bleeding edge python package versions (for example, I can
usually fix pylint errors in cutting edge PyPI packages before they
hit Fedora.)
That said, your changes here *do* improve the speed a lot - question,
why are we using LegacyMatcher instead of ... not a Legacy version? I
don't see good docs for this one on the distlib site. (Is this what
pip itself is using somewhere?)
--js
> +
> def _add_create_subcommand(subparsers: Any) -> None:
> subparser = subparsers.add_parser("create", help="create a venv")
> subparser.add_argument(
> @@ -319,13 +412,42 @@ def _add_create_subcommand(subparsers: Any) -> None:
> )
>
>
> +def _add_ensure_subcommand(subparsers: Any) -> None:
> + subparser = subparsers.add_parser(
> + "ensure", help="Ensure that the specified package is installed."
> + )
> + subparser.add_argument(
> + "--online",
> + action="store_true",
> + help="Install packages from PyPI, if necessary.",
> + )
> + subparser.add_argument(
> + "--dir",
> + type=str,
> + action="store",
> + help="Path to vendored packages where we may install from.",
> + )
> + subparser.add_argument(
> + "dep_specs",
> + type=str,
> + action="store",
> + help="PEP 508 Dependency specification, e.g. 'meson>=0.61.5'",
> + nargs="+",
> + )
> +
> +
> def main() -> int:
> """CLI interface to make_qemu_venv. See module docstring."""
> if os.environ.get("DEBUG") or os.environ.get("GITLAB_CI"):
> # You're welcome.
> logging.basicConfig(level=logging.DEBUG)
> - elif os.environ.get("V"):
> - logging.basicConfig(level=logging.INFO)
> + else:
> + if os.environ.get("V"):
> + logging.basicConfig(level=logging.INFO)
> +
> + # These are incredibly noisy even for V=1
> + logging.getLogger("distlib.metadata").addFilter(lambda record: False)
> + logging.getLogger("distlib.database").addFilter(lambda record: False)
>
> parser = argparse.ArgumentParser(
> prog="mkvenv",
> @@ -339,6 +461,7 @@ def main() -> int:
> )
>
> _add_create_subcommand(subparsers)
> + _add_ensure_subcommand(subparsers)
>
> args = parser.parse_args()
> try:
> @@ -348,6 +471,12 @@ def main() -> int:
> system_site_packages=True,
> clear=True,
> )
> + if args.command == "ensure":
> + ensure(
> + dep_specs=args.dep_specs,
> + online=args.online,
> + wheels_dir=args.dir,
> + )
> logger.debug("mkvenv.py %s: exiting", args.command)
> except Ouch as exc:
> print("\n*** Ouch! ***\n", file=sys.stderr)
> diff --git a/python/setup.cfg b/python/setup.cfg
> index 5b25f810fa8b..d680374b2950 100644
> --- a/python/setup.cfg
> +++ b/python/setup.cfg
> @@ -36,6 +36,7 @@ packages =
> # Remember to update tests/minreqs.txt if changing anything below:
> devel =
> avocado-framework >= 90.0
> + distlib >= 0.3.6
> flake8 >= 3.6.0
> fusepy >= 2.0.4
> isort >= 5.1.2
> @@ -112,6 +113,15 @@ ignore_missing_imports = True
> [mypy-pkg_resources]
> ignore_missing_imports = True
>
> +[mypy-distlib]
> +ignore_missing_imports = True
> +
> +[mypy-distlib.database]
> +ignore_missing_imports = True
> +
> +[mypy-distlib.version]
> +ignore_missing_imports = True
> +
> [pylint.messages control]
> # Disable the message, report, category or checker with the given id(s). You
> # can either give multiple identifiers separated by comma (,) or put this
> diff --git a/python/tests/minreqs.txt b/python/tests/minreqs.txt
> index dfb8abb155f4..7ecf5e7fe483 100644
> --- a/python/tests/minreqs.txt
> +++ b/python/tests/minreqs.txt
> @@ -16,6 +16,9 @@ urwid==2.1.2
> urwid-readline==0.13
> Pygments==2.9.0
>
> +# Dependencies for mkvenv
> +distlib==0.3.6
> +
> # Dependencies for FUSE support for qom-fuse
> fusepy==2.0.4
>
> --
> 2.40.1
>
>
