From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
qemu-block@nongnu.org, "Beraldo Leal" <bleal@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"John Snow" <jsnow@redhat.com>, "Kevin Wolf" <kwolf@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH RFC 1/6] experiment: add mkvenv install
Date: Tue, 20 Jun 2023 20:21:16 -0400 [thread overview]
Message-ID: <20230621002121.1609612-2-jsnow@redhat.com> (raw)
In-Reply-To: <20230621002121.1609612-1-jsnow@redhat.com>
This is just so I can do "mkvenv install './python'" or "mkvenv install
file:python" to install the in-tree packages to pyvenv.
It probably isn't quite appropriate to bypass do_ensure in its entirety
like this because we miss out on a lot of error handling, but as a quick
proof of concept it works just fine.
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/scripts/mkvenv.py | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/python/scripts/mkvenv.py b/python/scripts/mkvenv.py
index a47f1eaf5d..ea8df34111 100644
--- a/python/scripts/mkvenv.py
+++ b/python/scripts/mkvenv.py
@@ -940,6 +940,35 @@ def _add_ensure_subcommand(subparsers: Any) -> None:
)
+def _add_install_subcommand(subparsers: Any) -> None:
+ subparser = subparsers.add_parser(
+ "install", help="Install the specified package."
+ )
+ 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(
+ '--editable',
+ action="store_true",
+ help="Should package(s) be installed in editable mode?"
+ )
+ 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"):
@@ -964,6 +993,7 @@ def main() -> int:
_add_create_subcommand(subparsers)
_add_post_init_subcommand(subparsers)
_add_ensure_subcommand(subparsers)
+ _add_install_subcommand(subparsers)
args = parser.parse_args()
try:
@@ -982,6 +1012,16 @@ def main() -> int:
wheels_dir=args.dir,
prog=args.diagnose,
)
+ if args.command == "install":
+ print(f"mkvenv: installing {', '.join(args.dep_specs)}", file=sys.stderr)
+ pip_args = list(args.dep_specs)
+ if args.editable:
+ pip_args.insert(0, "--editable")
+ pip_install(
+ args=pip_args,
+ 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)
--
2.40.1
next prev parent reply other threads:[~2023-06-21 0:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-21 0:21 [PATCH RFC 0/6] Switch iotests to pyvenv John Snow
2023-06-21 0:21 ` John Snow [this message]
2023-06-21 0:21 ` [PATCH RFC 2/6] build, tests: Add qemu in-tree packages to pyvenv at configure time John Snow
2023-06-21 0:21 ` [PATCH RFC 3/6] iotests: get rid of '..' in path environment output John Snow
2023-06-21 0:21 ` [PATCH RFC 4/6] iotests: use the correct python to run linters John Snow
2023-06-21 0:21 ` [PATCH RFC 5/6] iotests: use pyvenv/bin/python3 to launch child test processes John Snow
2023-06-21 0:21 ` [PATCH RFC 6/6] iotests: don't add qemu.git/python to PYTHONPATH John Snow
2023-06-21 7:08 ` [PATCH RFC 0/6] Switch iotests to pyvenv Paolo Bonzini
2023-06-22 9:24 ` Paolo Bonzini
2023-06-22 21:03 ` John Snow
2023-06-22 21:04 ` Paolo Bonzini
2023-06-22 21:07 ` John Snow
2023-06-22 21:11 ` Paolo Bonzini
2023-06-22 21:18 ` John Snow
2023-06-22 21:57 ` 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=20230621002121.1609612-2-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=crosa@redhat.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/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).