[PATCH 02/12] tests: add Python3.12 to centos9.docker
John Snow <[email protected]>
| Newsgroups | org.nongnu.qemu-devel |
|---|---|
| Message-ID | <[email protected]> |
While we recently upgraded to Python 3.11 for the CentOS 9 container, upgrade it even further to Python 3.12. Signed-off-by: John Snow <[email protected]> --- tests/docker/dockerfiles/centos9.docker | 12 ++++++------ tests/lcitool/mappings.yml | 12 ++++++------ tests/lcitool/targets/centos-stream-9.yml | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerfiles/centos9.docker index 6f5c400c2db..8bfce395f9d 100644 --- a/tests/docker/dockerfiles/centos9.docker +++ b/tests/docker/dockerfiles/centos9.docker @@ -96,10 +96,10 @@ RUN dnf --quiet distro-sync -y && \ pkgconfig \ pulseaudio-libs-devel \ python3-tomli \ - python3.11 \ - python3.11-pip \ - python3.11-setuptools \ - python3.11-wheel \ + python3.12 \ + python3.12-pip \ + python3.12-setuptools \ + python3.12-wheel \ rdma-core-devel \ rust \ rust-std-static \ @@ -129,7 +129,7 @@ RUN dnf --quiet distro-sync -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN /usr/bin/pip3.11 install \ +RUN /usr/bin/pip3.12 install \ numpy \ opencv-python \ sphinx \ @@ -139,7 +139,7 @@ ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" ENV LANG="en_US.UTF-8" ENV MAKE="/usr/bin/make" ENV NINJA="/usr/bin/ninja" -ENV PYTHON="/usr/bin/python3.11" +ENV PYTHON="/usr/bin/python3.12" # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index 2b317e0a61c..5c56e4aca1b 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -4,16 +4,16 @@ mappings: Ubuntu2204: python3: - CentOSStream9: python3.11 + CentOSStream9: python3.12 python3-devel: - CentOSStream9: python3.11-devel + CentOSStream9: python3.21-devel python3-pip: - CentOSStream9: python3.11-pip + CentOSStream9: python3.12-pip python3-setuptools: - CentOSStream9: python3.11-setuptools + CentOSStream9: python3.12-setuptools python3-sphinx: CentOSStream9: @@ -28,10 +28,10 @@ mappings: CentOSStream9: python3-venv: - CentOSStream9: python3.11 + CentOSStream9: python3.12 python3-wheel: - CentOSStream9: python3.11-wheel + CentOSStream9: python3.12-wheel meson: # Use Meson from PyPI wherever Rust is enabled diff --git a/tests/lcitool/targets/centos-stream-9.yml b/tests/lcitool/targets/centos-stream-9.yml index c2d87f6cb4d..0d6801fd9a3 100644 --- a/tests/lcitool/targets/centos-stream-9.yml +++ b/tests/lcitool/targets/centos-stream-9.yml @@ -1,3 +1,3 @@ paths: - pip3: /usr/bin/pip3.11 - python: /usr/bin/python3.11 + pip3: /usr/bin/pip3.12 + python: /usr/bin/python3.12 -- 2.55.0