[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v2 08/10] configure: create a python venv unconditionally
From: |
John Snow |
Subject: |
[RFC PATCH v2 08/10] configure: create a python venv unconditionally |
Date: |
Fri, 14 Apr 2023 01:54:47 -0400 |
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
- [RFC PATCH v2 00/10] configure: create a python venv and install meson, John Snow, 2023/04/14
- [RFC PATCH v2 01/10] python: add mkvenv.py, John Snow, 2023/04/14
- [RFC PATCH v2 05/10] tests/vm: add py310-expat to NetBSD, John Snow, 2023/04/14
- [RFC PATCH v2 02/10] tests: add python3-venv dependency, John Snow, 2023/04/14
- [RFC PATCH v2 08/10] configure: create a python venv unconditionally,
John Snow <=
- [RFC PATCH v2 03/10] mkvenv: Add better error message for missing pyexapt module, John Snow, 2023/04/14
- [RFC PATCH v2 06/10] mkvenv: generate console entry shims from inside the venv, John Snow, 2023/04/14
- [RFC PATCH v2 07/10] mkvenv: work around broken pip installations on Debian 10, John Snow, 2023/04/14
- [RFC PATCH v2 04/10] tests/vm: Configure netbsd to use Python 3.10, John Snow, 2023/04/14
- [RFC PATCH v2 09/10] configure: remove --meson=; install meson to the pyvenv, John Snow, 2023/04/14
- [RFC PATCH v2 10/10] tests: Use configure-provided pyvenv for tests, John Snow, 2023/04/14