From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Cleber Rosa" <crosa@redhat.com>, "Ani Sinha" <ani@anisinha.ca>,
"Warner Losh" <imp@bsdimp.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Reinoud Zandijk" <reinoud@netbsd.org>,
"Thomas Huth" <thuth@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"John Snow" <jsnow@redhat.com>, "Ryo ONODERA" <ryoon@netbsd.org>,
"Kyle Evans" <kevans@freebsd.org>,
"Beraldo Leal" <bleal@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [RFC PATCH v2 08/10] configure: create a python venv unconditionally
Date: Fri, 14 Apr 2023 01:54:47 -0400 [thread overview]
Message-ID: <20230414055449.4028284-9-jsnow@redhat.com> (raw)
In-Reply-To: <20230414055449.4028284-1-jsnow@redhat.com>
This patch changes the configure script so that it always creates a
python virtual environment unconditionally. Meson bootstrapping is
temporarily altered to force the use of meson from git or vendored
source.
(A patch later in this series restores the use of a
distribution-provided Meson.)
Signed-off-by: John Snow <jsnow@redhat.com>
---
configure | 34 +++++++++++++++++++++++++++++-----
1 file changed, 29 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 800b5850f4..03278fd891 100755
--- a/configure
+++ b/configure
@@ -608,7 +608,6 @@ check_py_version() {
python=
first_python=
if test -z "${PYTHON}"; then
- explicit_python=no
# A bare 'python' is traditionally python 2.x, but some distros
# have it as python 3.x, so check in both places.
for binary in python3 python python3.11 python3.10 python3.9 python3.8 python3.7 python3.6; do
@@ -627,7 +626,6 @@ else
# Same as above, but only check the environment variable.
has "${PYTHON}" || error_exit "The PYTHON environment variable does not point to an executable"
python=$(command -v "$PYTHON")
- explicit_python=yes
if check_py_version "$python"; then
# This one is good.
first_python=
@@ -719,7 +717,7 @@ for opt do
;;
--install=*)
;;
- --python=*) python="$optarg" ; explicit_python=yes
+ --python=*) python="$optarg"
;;
--skip-meson) skip_meson=yes
;;
@@ -1079,8 +1077,34 @@ if ! check_py_version "$python"; then
"Use --python=/path/to/python to specify a supported Python."
fi
-# Resolve PATH + suppress writing compiled files
-python="$(command -v "$python") -B"
+# Resolve PATH
+python="$(command -v "$python")"
+explicit_python=yes
+
+# Create a Python virtual environment using our configured python.
+# The stdout of this script will be the location of a symlink that
+# points to the configured Python.
+# Entry point scripts for pip, meson, and sphinx are generated if those
+# packages are present.
+
+# Defaults assumed for now:
+# - venv is cleared if it exists already;
+# - venv is allowed to use system packages;
+# - all setup is performed **offline**;
+# - No packages are installed by default;
+# - pip is not installed into the venv when possible,
+# but ensurepip is called as a fallback when necessary.
+
+echo "python determined to be '$python'"
+echo "python version: $($python --version)"
+
+python="$($python -B "${source_path}/python/scripts/mkvenv.py" create --gen pip,meson,sphinx pyvenv)"
+if test "$?" -ne 0 ; then
+ error_exit "python venv creation failed"
+fi
+
+# Suppress writing compiled files
+python="$python -B"
has_meson() {
local python_dir=$(dirname "$python")
--
2.39.2
next prev parent reply other threads:[~2023-04-14 5:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-14 5:54 [RFC PATCH v2 00/10] configure: create a python venv and install meson John Snow
2023-04-14 5:54 ` [RFC PATCH v2 01/10] python: add mkvenv.py John Snow
2023-04-14 5:54 ` [RFC PATCH v2 02/10] tests: add python3-venv dependency John Snow
2023-04-14 14:17 ` Philippe Mathieu-Daudé
2023-04-14 5:54 ` [RFC PATCH v2 03/10] mkvenv: Add better error message for missing pyexapt module John Snow
2023-04-14 5:54 ` [RFC PATCH v2 04/10] tests/vm: Configure netbsd to use Python 3.10 John Snow
2023-04-14 5:54 ` [RFC PATCH v2 05/10] tests/vm: add py310-expat to NetBSD John Snow
2023-04-14 5:54 ` [RFC PATCH v2 06/10] mkvenv: generate console entry shims from inside the venv John Snow
2023-04-14 5:54 ` [RFC PATCH v2 07/10] mkvenv: work around broken pip installations on Debian 10 John Snow
2023-04-14 5:54 ` John Snow [this message]
2023-04-14 5:54 ` [RFC PATCH v2 09/10] configure: remove --meson=; install meson to the pyvenv John Snow
2023-04-14 5:54 ` [RFC PATCH v2 10/10] tests: Use configure-provided pyvenv for tests John Snow
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=20230414055449.4028284-9-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=ani@anisinha.ca \
--cc=bleal@redhat.com \
--cc=crosa@redhat.com \
--cc=imp@bsdimp.com \
--cc=kevans@freebsd.org \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=reinoud@netbsd.org \
--cc=ryoon@netbsd.org \
--cc=thuth@redhat.com \
--cc=wainersm@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).