[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/27] tests/docker: add python3-venv dependency
|
From: |
John Snow |
|
Subject: |
[PATCH 11/27] tests/docker: add python3-venv dependency |
|
Date: |
Wed, 10 May 2023 23:54:19 -0400 |
Several debian-based tests need the python3-venv dependency as a
consequence of Debian debundling the "ensurepip" module normally
included with Python.
As mkvenv.py stands as of this commit, Debian requires EITHER:
(A) setuptools and pip, or
(B) ensurepip
mkvenv is a few seconds faster if you have setuptools and pip, so
developers should prefer the first requirement. For the purposes of CI,
the time-save is a wash; it's only a matter of who is responsible for
installing pip and when; the timing is about the same.
Arbitrarily, I chose adding ensurepip to the test configuration because
it is normally part of the Python stdlib, and always having it allows us
a more consistent cross-platform environment.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/docker/dockerfiles/debian-all-test-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-hexagon-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-riscv64-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-tricore-cross.docker | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker
b/tests/docker/dockerfiles/debian-all-test-cross.docker
index 981e9bdc7b..f9f401544a 100644
--- a/tests/docker/dockerfiles/debian-all-test-cross.docker
+++ b/tests/docker/dockerfiles/debian-all-test-cross.docker
@@ -57,7 +57,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
gcc-sh4-linux-gnu \
libc6-dev-sh4-cross \
gcc-sparc64-linux-gnu \
- libc6-dev-sparc64-cross
+ libc6-dev-sparc64-cross \
+ python3-venv
ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools
ENV DEF_TARGET_LIST
aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user
diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker
b/tests/docker/dockerfiles/debian-hexagon-cross.docker
index b99d99f943..c2cfb6a5d0 100644
--- a/tests/docker/dockerfiles/debian-hexagon-cross.docker
+++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker
@@ -20,7 +20,8 @@ RUN apt-get update && \
bison \
flex \
git \
- ninja-build && \
+ ninja-build \
+ python3-venv && \
# Install QEMU build deps for use in CI
DEBIAN_FRONTEND=noninteractive eatmydata \
apt build-dep -yy --arch-only qemu
diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker
b/tests/docker/dockerfiles/debian-riscv64-cross.docker
index 803afb9573..081404e014 100644
--- a/tests/docker/dockerfiles/debian-riscv64-cross.docker
+++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker
@@ -28,7 +28,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \
libglib2.0-dev \
ninja-build \
pkg-config \
- python3
+ python3 \
+ python3-venv
# Add ports and riscv64 architecture
RUN echo "deb http://ftp.ports.debian.org/debian-ports/ sid main" >>
/etc/apt/sources.list
diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker
b/tests/docker/dockerfiles/debian-tricore-cross.docker
index cfd2faf9a8..269bfa8d42 100644
--- a/tests/docker/dockerfiles/debian-tricore-cross.docker
+++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
@@ -33,7 +33,8 @@ RUN apt update && \
pkgconf \
python3-pip \
python3-setuptools \
- python3-wheel
+ python3-wheel \
+ python3-venv
RUN curl -#SL
https://github.com/bkoppelmann/package_940/releases/download/tricore-toolchain-9.40/tricore-toolchain-9.4.0.tar.gz
\
| tar -xzC /usr/local/
--
2.40.0
- [PATCH 06/27] mkvenv: add ensure subcommand, (continued)
[PATCH 13/27] tests/vm: add py310-expat to NetBSD, John Snow, 2023/05/10
[PATCH 12/27] tests/vm: Configure netbsd to use Python 3.10, John Snow, 2023/05/10
[PATCH 09/27] mkvenv: create pip binary in virtual environment, John Snow, 2023/05/10
[PATCH 11/27] tests/docker: add python3-venv dependency,
John Snow <=
[PATCH 14/27] python: add vendor.py utility, John Snow, 2023/05/10
[PATCH 15/27] configure: create a python venv unconditionally, John Snow, 2023/05/10
[PATCH 17/27] configure: use 'mkvenv ensure meson' to bootstrap meson, John Snow, 2023/05/10
[PATCH 19/27] tests: Use configure-provided pyvenv for tests, John Snow, 2023/05/10
[PATCH 20/27] configure: move --enable-docs and --disable-docs back to configure, John Snow, 2023/05/10
[PATCH 10/27] mkvenv: work around broken pip installations on Debian 10, John Snow, 2023/05/10
[PATCH 18/27] qemu.git: drop meson git submodule, John Snow, 2023/05/10
[PATCH 21/27] configure: bootstrap sphinx with mkvenv, John Snow, 2023/05/10
[PATCH 23/27] Python: Drop support for Python 3.6, John Snow, 2023/05/10
[PATCH 22/27] configure: add --enable-pypi and --disable-pypi, John Snow, 2023/05/10