Do not support Debian 9 and Python 3.5 anymore
PATCH 2/7 gitlab-ci: Remove the Debian9-based containers and containers-layer3
In reply to Thomas HuthAccording to our support policy, Debian 9 is not supported by the QEMU project anymore. Since we now switched the MinGW cross-compiler builds to Fedora, we do not need these Debian9-based containers in the gitlab-CI anymore, and can now also get rid of the "layer3" container build stage this way.
--- .gitlab-ci.d/containers.yml | 14 -------------- .gitlab-ci.yml | 1 - 2 files changed, 15 deletions(-)
.gitlab-ci.d/containers.yml +0 -14
@@ -214,20 +214,6 @@ tricore-debian-cross-container: variables: NAME: debian-tricore-cross -win32-debian-cross-container: - <<: *container_job_definition - stage: containers-layer3 - needs: ['amd64-debian9-mxe-container'] - variables: - NAME: debian-win32-cross - -win64-debian-cross-container: - <<: *container_job_definition - stage: containers-layer3 - needs: ['amd64-debian9-mxe-container'] - variables: - NAME: debian-win64-cross - xtensa-debian-cross-container: <<: *container_job_definition variables:
.gitlab-ci.yml +0 -1
@@ -4,7 +4,6 @@ stages: - containers - containers-layer2 - - containers-layer3 - build - test
Signature · 1 line
2.18.2
cover Do not support Debian 9 and Python 3.5 anymore
Debian 9 is EOL now, and according to our support policy, we do not support it anymore. Let's switch the corresponding CI builds to either Fedora (for a more recent version of the MinGW compilers) or Debian 10 instead.
Together with the Travis patch series that I recently posted ("Update Travis from Xenial to Bionic and Focal"), our CI should now be free of distros that we do not support anymore. And all supported build systems now use at least Python 3.6, so we can drop the support for Python 3.5.
Based-on: <[email protected]>
Thomas Huth (7):
tests/docker: Use Fedora containers for MinGW cross-builds in the
gitlab-CI
gitlab-ci: Remove the Debian9-based containers and containers-layer3 tests/docker: Update the tricore container to debian 10 shippable.yml: Remove the Debian9-based MinGW cross-compiler tests tests/docker: Remove old Debian 9 containers
gitlab-ci: Increase the timeout for the cross-compiler builds
configure: Bump the minimum required Python version to 3.6
.gitlab-ci.d/containers.yml | 38 +++++----------- .gitlab-ci.d/crossbuilds.yml | 5 ++- .gitlab-ci.yml | 1 - .shippable.yml | 4 -- configure | 4 +- tests/docker/Makefile.include | 2 +- .../dockerfiles/debian-tricore-cross.docker | 2 +- .../dockerfiles/debian-win32-cross.docker | 38 ---------------- .../dockerfiles/debian-win64-cross.docker | 45 ------------------- tests/docker/dockerfiles/debian9-mxe.docker | 21 --------- tests/docker/dockerfiles/debian9.docker | 32 ------------- .../dockerfiles/fedora-win32-cross.docker | 42 +++++++++++++++++ .../dockerfiles/fedora-win64-cross.docker | 38 ++++++++++++++++ 13 files changed, 98 insertions(+), 174 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-win32-cross.docker delete mode 100644 tests/docker/dockerfiles/debian-win64-cross.docker delete mode 100644 tests/docker/dockerfiles/debian9-mxe.docker delete mode 100644 tests/docker/dockerfiles/debian9.docker create mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker create mode 100644 tests/docker/dockerfiles/fedora-win64-cross.docker
Signature · 1 line
2.18.2
PATCH 5/7 tests/docker: Remove old Debian 9 containers
We do not support Debian 9 in QEMU anymore, and the Debian 9 containers are now no longer used in the gitlab-CI. Time to remove them.
--- .gitlab-ci.d/containers.yml | 12 ----- .../dockerfiles/debian-win32-cross.docker | 38 ---------------- .../dockerfiles/debian-win64-cross.docker | 45 ------------------- tests/docker/dockerfiles/debian9-mxe.docker | 21 --------- tests/docker/dockerfiles/debian9.docker | 32 ------------- 5 files changed, 148 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-win32-cross.docker delete mode 100644 tests/docker/dockerfiles/debian-win64-cross.docker delete mode 100644 tests/docker/dockerfiles/debian9-mxe.docker delete mode 100644 tests/docker/dockerfiles/debian9.docker
.gitlab-ci.d/containers.yml +0 -12
@@ -48,18 +48,6 @@ amd64-debian11-container: variables: NAME: debian11 -amd64-debian9-container: - <<: *container_job_definition - variables: - NAME: debian9 - -amd64-debian9-mxe-container: - <<: *container_job_definition - stage: containers-layer2 - needs: ['amd64-debian9-container'] - variables: - NAME: debian9-mxe - alpha-debian-cross-container: <<: *container_job_definition stage: containers-layer2
tests/docker/dockerfiles/debian-win32-cross.docker deleted +0 -38
@@ -1,38 +0,0 @@ -# -# Docker mingw32 cross-compiler target -# -# This docker target builds on the debian Stretch MXE base image. -# -FROM qemu/debian9-mxe - -MAINTAINER Philippe Mathieu-Daudé <[email protected]> - -ENV TARGET i686 - -ENV PATH $PATH:/usr/lib/mxe/usr/bin:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin - -ENV PKG_CONFIG_PATH \ - $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgconfig - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt-get install -y --no-install-recommends \ - mxe-$TARGET-w64-mingw32.shared-bzip2 \ - mxe-$TARGET-w64-mingw32.shared-curl \ - mxe-$TARGET-w64-mingw32.shared-glib \ - mxe-$TARGET-w64-mingw32.shared-libgcrypt \ - mxe-$TARGET-w64-mingw32.shared-libusb1 \ - mxe-$TARGET-w64-mingw32.shared-lzo \ - mxe-$TARGET-w64-mingw32.shared-nettle \ - mxe-$TARGET-w64-mingw32.shared-ncurses \ - mxe-$TARGET-w64-mingw32.shared-nsis \ - mxe-$TARGET-w64-mingw32.shared-pixman \ - mxe-$TARGET-w64-mingw32.shared-pkgconf \ - mxe-$TARGET-w64-mingw32.shared-pthreads \ - mxe-$TARGET-w64-mingw32.shared-sdl2 \ - mxe-$TARGET-w64-mingw32.shared-sdl2-mixer \ - mxe-$TARGET-w64-mingw32.shared-sdl2-gfx \ - mxe-$TARGET-w64-mingw32.shared-zlib - -# Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=$TARGET-w64-mingw32.shared-
tests/docker/dockerfiles/debian-win64-cross.docker deleted +0 -45
45 lines not on this page · raw message
tests/docker/dockerfiles/debian9-mxe.docker deleted +0 -21
@@ -1,21 +0,0 @@ -# -# Docker mingw cross-compiler target -# -# This docker target builds on the debian Stretch base image. -# -FROM qemu/debian9 - -MAINTAINER Philippe Mathieu-Daudé <[email protected]> - -RUN DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends gnupg dirmngr - -# Add the foreign architecture we want and install dependencies -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C6BF758A33A3A276 && \ - echo "deb http://pkg.mxe.cc/repos/apt stretch main" > /etc/apt/sources.list.d/mxeapt.list -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt-get install -y --no-install-recommends \ - $(apt-get -s install -y --no-install-recommends gw32.shared-mingw-w64 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\ -f2) - -ENV PATH $PATH:/usr/lib/mxe/usr/bin/
tests/docker/dockerfiles/debian9.docker deleted +0 -32
@@ -1,32 +0,0 @@ -# -# Docker multiarch cross-compiler target -# -# This docker target is builds on Debian cross compiler targets to build distro -# with a selection of cross compilers for building test binaries. -# -# On its own you can't build much but the docker-foo-cross targets -# build on top of the base debian image. -# -FROM debian:stretch-slim - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list - -# Install common build utilities -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - bc \ - build-essential \ - ca-certificates \ - clang \ - gdb-multiarch \ - gettext \ - git \ - libncurses5-dev \ - pkg-config \ - psmisc \ - python3 \ - python3-setuptools \ - $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
Signature · 1 line
2.18.2
PATCH 7/7 configure: Bump the minimum required Python version to 3.6
In reply to Thomas HuthAll our supported build platforms have Python 3.6 or newer nowadays, and there are some useful features in Python 3.6 which are not available in 3.5 yet, so let's bump the minimum Python version to 3.6 now.
--- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
configure +2 -2
@@ -1965,8 +1965,8 @@ fi # Note that if the Python conditional here evaluates True we will exit # with status 1 which is a shell 'false' value. -if ! $python -c 'import sys; sys.exit(sys.version_info < (3,5))'; then - error_exit "Cannot use '$python', Python >= 3.5 is required." \ +if ! $python -c 'import sys; sys.exit(sys.version_info < (3,6))'; then + error_exit "Cannot use '$python', Python >= 3.6 is required." \ "Use --python=/path/to/python to specify a supported Python." fi
Signature · 1 line
2.18.2
PATCH 1/7 tests/docker: Use Fedora containers for MinGW cross-builds in the gitlab-CI
In reply to Thomas HuthAccording to our support policy, we do not support Debian 9 in QEMU anymore, and we only support building the Windows binaries with a very recent version of the MinGW toolchain. So we should not test the MinGW cross-compilation with Debian 9 anymore, but switch to something newer like Fedora. To do this, we need a separate Fedora container for each build that provides the QEMU_CONFIGURE_OPTS environment variable.
Unfortunately, the MinGW 64-bit compiler seems to be a little bit slow, so we also have to disable some features like "capstone" in the build here to make sure that the CI pipelines still finish within a reasonable amount of time.
--- .gitlab-ci.d/containers.yml | 10 +++++ .gitlab-ci.d/crossbuilds.yml | 4 +- .../dockerfiles/fedora-win32-cross.docker | 42 +++++++++++++++++++ .../dockerfiles/fedora-win64-cross.docker | 38 +++++++++++++++++ 4 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker create mode 100644 tests/docker/dockerfiles/fedora-win64-cross.docker
.gitlab-ci.d/containers.yml +10 -0
@@ -248,6 +248,16 @@ i386-fedora-cross-container: variables: NAME: fedora-i386-cross +win32-fedora-cross-container: + <<: *container_job_definition + variables: + NAME: fedora-win32-cross + +win64-fedora-cross-container: + <<: *container_job_definition + variables: + NAME: fedora-win64-cross + amd64-ubuntu1804-container: <<: *container_job_definition variables:
.gitlab-ci.d/crossbuilds.yml +2 -2
@@ -105,9 +105,9 @@ cross-s390x-user: cross-win32-system: <<: *cross_system_build_job_definition variables: - IMAGE: debian-win32-cross + IMAGE: fedora-win32-cross cross-win64-system: <<: *cross_system_build_job_definition variables: - IMAGE: debian-win64-cross + IMAGE: fedora-win64-cross
tests/docker/dockerfiles/fedora-win32-cross.docker new file +42 -0
42 lines not on this page · raw message
tests/docker/dockerfiles/fedora-win64-cross.docker new file +38 -0
@@ -0,0 +1,38 @@ +FROM fedora:32 + +# Please keep this list sorted alphabetically +ENV PACKAGES \ + bc \ + bzip2 \ + diffutils \ + findutils \ + gcc \ + gettext \ + git \ + hostname \ + make \ + meson \ + mingw64-bzip2 \ + mingw64-curl \ + mingw64-glib2 \ + mingw64-gmp \ + mingw64-gtk3 \ + mingw64-libjpeg-turbo \ + mingw64-libpng \ + mingw64-libtasn1 \ + mingw64-pixman \ + mingw64-pkg-config \ + perl \ + perl-Test-Harness \ + python3 \ + python3-PyYAML \ + python3-setuptools \ + tar \ + which + +RUN dnf install -y $PACKAGES +RUN rpm -q $PACKAGES | sort > /packages.txt +ENV FEATURES mingw + +# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32- --disable-capstone
Signature · 1 line
2.18.2
PATCH 6/7 gitlab-ci: Increase the timeout for the cross-compiler builds
In reply to Thomas HuthSome of the cross-compiler builds (the mips build and the win64 build for example) are quite slow and sometimes hit the 1h time limit. Increase the limit a little bit to make sure that we do not get failures in the CI runs just because of some few minutes.
--- .gitlab-ci.d/crossbuilds.yml | 1 + 1 file changed, 1 insertion(+)
.gitlab-ci.d/crossbuilds.yml +1 -0
@@ -2,6 +2,7 @@ .cross_system_build_job_template: &cross_system_build_job_definition stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + timeout: 80m script: - mkdir build - cd build
Signature · 1 line
2.18.2
PATCH 3/7 tests/docker: Update the tricore container to debian 10
In reply to Thomas HuthWe do not support Debian 9 anymore, thus update the Tricore container to Debian 10 now.
--- .gitlab-ci.d/containers.yml | 2 +- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-tricore-cross.docker | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
.gitlab-ci.d/containers.yml +1 -1
@@ -210,7 +210,7 @@ sparc64-debian-cross-container: tricore-debian-cross-container: <<: *container_job_definition stage: containers-layer2 - needs: ['amd64-debian9-container'] + needs: ['amd64-debian10-container'] variables: NAME: debian-tricore-cross
tests/docker/Makefile.include +1 -1
@@ -137,7 +137,7 @@ docker-image-debian-sparc64-cross: docker-image-debian10 docker-image-travis: NOUSER=1 # Specialist build images, sometimes very limited tools -docker-image-debian-tricore-cross: docker-image-debian9 +docker-image-debian-tricore-cross: docker-image-debian10 docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-arm64-test-cross: docker-image-debian11
tests/docker/dockerfiles/debian-tricore-cross.docker +1 -1
@@ -7,7 +7,7 @@ # # SPDX-License-Identifier: GPL-2.0-or-later # -FROM qemu/debian9 +FROM qemu/debian10 MAINTAINER Philippe Mathieu-Daudé <[email protected]>
Signature · 1 line
2.18.2
PATCH 4/7 shippable.yml: Remove the Debian9-based MinGW cross-compiler tests
In reply to Thomas HuthWe're not supporting Debian 9 anymore, and we are now testing MinGW cross-compiler builds in the gitlab-CI, too, so we do not really need these jobs in the shippable.yml anymore.
--- .shippable.yml | 4 ---- 1 file changed, 4 deletions(-)
.shippable.yml +0 -4
@@ -7,10 +7,6 @@ env: matrix: - IMAGE=debian-amd64 TARGET_LIST=x86_64-softmmu,x86_64-linux-user - - IMAGE=debian-win32-cross - TARGET_LIST=arm-softmmu,i386-softmmu - - IMAGE=debian-win64-cross - TARGET_LIST=aarch64-softmmu,sparc64-softmmu,x86_64-softmmu - IMAGE=debian-armel-cross TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user - IMAGE=debian-armhf-cross
Signature · 1 line
2.18.2
Re: [PATCH 1/7] tests/docker: Use Fedora containers for MinGW cross-builds in the gitlab-CI
In reply to Thomas HuthQuoted 83 lines · Thomas Huth
According to our support policy, we do not support Debian 9 in QEMU anymore, and we only support building the Windows binaries with a very recent version of the MinGW toolchain. So we should not test the MinGW cross-compilation with Debian 9 anymore, but switch to something newer like Fedora. To do this, we need a separate Fedora container for each build that provides the
QEMU_CONFIGURE_OPTSenvironment variable.
Unfortunately, the MinGW 64-bit compiler seems to be a little bit slow, so we also have to disable some features like "capstone" in the build here to make sure that the CI pipelines still finish within a reasonable amount of time.Signed-off-by Thomas Huth <[email protected]>--- .gitlab-ci.d/containers.yml | 10 +++++ .gitlab-ci.d/crossbuilds.yml | 4 +- .../dockerfiles/fedora-win32-cross.docker | 42 +++++++++++++++++++ .../dockerfiles/fedora-win64-cross.docker | 38 +++++++++++++++++ 4 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker create mode 100644 tests/docker/dockerfiles/fedora-win64-cross.docker.gitlab-ci.d/containers.yml +10
-0@@ -248,6 +248,16 @@ i386-fedora-cross-container: variables: NAME: fedora-i386-cross +win32-fedora-cross-container: + <<: *container_job_definition + variables: + NAME: fedora-win32-cross + +win64-fedora-cross-container: + <<: *container_job_definition + variables: + NAME: fedora-win64-cross + amd64-ubuntu1804-container: <<: *container_job_definition variables:.gitlab-ci.d/crossbuilds.yml +2
-2@@ -105,9 +105,9 @@ cross-s390x-user: cross-win32-system: <<: *cross_system_build_job_definition variables: - IMAGE: debian-win32-cross + IMAGE: fedora-win32-cross cross-win64-system: <<: *cross_system_build_job_definition variables: - IMAGE: debian-win64-cross + IMAGE: fedora-win64-crosstests/docker/dockerfiles/fedora-win32-cross.docker new file +18
-0@@ -0,0 +1,42 @@ +FROM fedora:32 + +# Please keep this list sorted alphabetically +ENV PACKAGES \ + bc \ + bzip2 \ + diffutils \ + findutils \ + gcc \ + gettext \ + git \ + hostname \ + make \ + meson \ + mingw32-bzip2 \ + mingw32-curl \ + mingw32-glib2 \ + mingw32-gmp \
tests/docker/dockerfiles/fedora-win32-cross.docker line 28
Quoted 10 lines
tests/docker/dockerfiles/fedora-win32-cross.docker new file +10
-0+ mingw32-gnutls \ + mingw32-gtk3 \ + mingw32-libjpeg-turbo \ + mingw32-libpng \ + mingw32-libtasn1 \ + mingw32-nettle \ + mingw32-nsis \ + mingw32-pixman \ + mingw32-pkg-config \ + mingw32-SDL2 \
It feels like we could be removing the mingw packages from the main fedora.docker now, so it results in smaller images.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 2/7] gitlab-ci: Remove the Debian9-based containers and containers-layer3
In reply to Thomas HuthQuoted 11 lines · Thomas Huth
According to our support policy, Debian 9 is not supported by the QEMU project anymore. Since we now switched the MinGW cross-compiler builds to Fedora, we do not need these Debian9-based containers in the gitlab-CI anymore, and can now also get rid of the "layer3" container build stage this way.
Signed-off-by Thomas Huth <[email protected]>--- .gitlab-ci.d/containers.yml | 14 -------------- .gitlab-ci.yml | 1 - 2 files changed, 15 deletions(-)
Quoted 31 lines
.gitlab-ci.d/containers.yml +0
-14@@ -214,20 +214,6 @@ tricore-debian-cross-container: variables: NAME: debian-tricore-cross -win32-debian-cross-container: - <<: *container_job_definition - stage: containers-layer3 - needs: ['amd64-debian9-mxe-container'] - variables: - NAME: debian-win32-cross - -win64-debian-cross-container: - <<: *container_job_definition - stage: containers-layer3 - needs: ['amd64-debian9-mxe-container'] - variables: - NAME: debian-win64-cross - xtensa-debian-cross-container: <<: *container_job_definition variables:.gitlab-ci.yml +0
-0
.gitlab-ci.yml line 7
Quoted 4 lines
.gitlab-ci.yml +0
-1@@ -4,7 +4,6 @@ stages: - containers - containers-layer2 - - containers-layer3
Yay, I never liked having so many layers.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 3/7] tests/docker: Update the tricore container to debian 10
In reply to Thomas HuthQuoted 9 lines · Thomas Huth
We do not support Debian 9 anymore, thus update the Tricore container to Debian 10 now.
Signed-off-by Thomas Huth <[email protected]>--- .gitlab-ci.d/containers.yml | 2 +- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-tricore-cross.docker | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 5/7] tests/docker: Remove old Debian 9 containers
In reply to Thomas HuthQuoted 4 lines · Thomas Huth
We do not support Debian 9 in QEMU anymore, and the Debian 9 containers are now no longer used in the gitlab-CI. Time to remove them.
Signed-off-by Thomas Huth <[email protected]>
Quoted 11 lines
--- .gitlab-ci.d/containers.yml | 12 ----- .../dockerfiles/debian-win32-cross.docker | 38 ---------------- .../dockerfiles/debian-win64-cross.docker | 45 ------------------- tests/docker/dockerfiles/debian9-mxe.docker | 21 --------- tests/docker/dockerfiles/debian9.docker | 32 ------------- 5 files changed, 148 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-win32-cross.docker delete mode 100644 tests/docker/dockerfiles/debian-win64-cross.docker delete mode 100644 tests/docker/dockerfiles/debian9-mxe.docker delete mode 100644 tests/docker/dockerfiles/debian9.docker
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 11 lines · Thomas Huth
Debian 9 is EOL now, and according to our support policy, we do not support it anymore. Let's switch the corresponding CI builds to either Fedora (for a more recent version of the MinGW compilers) or Debian 10 instead.
Together with the Travis patch series that I recently posted ("Update Travis from Xenial to Bionic and Focal"), our CI should now be free of distros that we do not support anymore. And all supported build systems now use at least Python 3.6, so we can drop the support for Python 3.5.
Based-on: <[email protected]>
I'm inclined to take all of these but I'll take all the CI based ones now and add the 3.6 bump if there is more review/acks for it.
Quoted 31 lines
Thomas Huth (7):
tests/docker: Use Fedora containers for MinGW cross-builds in the
gitlab-CI
gitlab-ci: Remove the Debian9-based containers and containers-layer3 tests/docker: Update the tricore container to debian 10 shippable.yml: Remove the Debian9-based MinGW cross-compiler tests tests/docker: Remove old Debian 9 containers
gitlab-ci: Increase the timeout for the cross-compiler builds
configure: Bump the minimum required Python version to 3.6.gitlab-ci.d/containers.yml | 38 +++++----------- .gitlab-ci.d/crossbuilds.yml | 5 ++- .gitlab-ci.yml | 1 - .shippable.yml | 4 -- configure | 4 +- tests/docker/Makefile.include | 2 +- .../dockerfiles/debian-tricore-cross.docker | 2 +- .../dockerfiles/debian-win32-cross.docker | 38 ---------------- .../dockerfiles/debian-win64-cross.docker | 45 ------------------- tests/docker/dockerfiles/debian9-mxe.docker | 21 --------- tests/docker/dockerfiles/debian9.docker | 32 ------------- .../dockerfiles/fedora-win32-cross.docker | 42 +++++++++++++++++ .../dockerfiles/fedora-win64-cross.docker | 38 ++++++++++++++++ 13 files changed, 98 insertions(+), 174 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-win32-cross.docker delete mode 100644 tests/docker/dockerfiles/debian-win64-cross.docker delete mode 100644 tests/docker/dockerfiles/debian9-mxe.docker delete mode 100644 tests/docker/dockerfiles/debian9.docker create mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker create mode 100644 tests/docker/dockerfiles/fedora-win64-cross.docker
Signature · 1 line
Alex Bennée
Re: [PATCH 1/7] tests/docker: Use Fedora containers for MinGW cross-builds in the gitlab-CI
In reply to Daniel P. BerrangéQuoted 89 lines · Daniel P. Berrangé
Quoted 88 lines · Thomas Huth
According to our support policy, we do not support Debian 9 in QEMU anymore, and we only support building the Windows binaries with a very recent version of the MinGW toolchain. So we should not test the MinGW cross-compilation with Debian 9 anymore, but switch to something newer like Fedora. To do this, we need a separate Fedora container for each build that provides the
QEMU_CONFIGURE_OPTSenvironment variable.
Unfortunately, the MinGW 64-bit compiler seems to be a little bit slow, so we also have to disable some features like "capstone" in the build here to make sure that the CI pipelines still finish within a reasonable amount of time.Signed-off-by Thomas Huth <[email protected]>--- .gitlab-ci.d/containers.yml | 10 +++++ .gitlab-ci.d/crossbuilds.yml | 4 +- .../dockerfiles/fedora-win32-cross.docker | 42 +++++++++++++++++++ .../dockerfiles/fedora-win64-cross.docker | 38 +++++++++++++++++ 4 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker create mode 100644 tests/docker/dockerfiles/fedora-win64-cross.docker.gitlab-ci.d/containers.yml +10
-0@@ -248,6 +248,16 @@ i386-fedora-cross-container: variables: NAME: fedora-i386-cross +win32-fedora-cross-container: + <<: *container_job_definition + variables: + NAME: fedora-win32-cross + +win64-fedora-cross-container: + <<: *container_job_definition + variables: + NAME: fedora-win64-cross + amd64-ubuntu1804-container: <<: *container_job_definition variables:.gitlab-ci.d/crossbuilds.yml +2
-2@@ -105,9 +105,9 @@ cross-s390x-user: cross-win32-system: <<: *cross_system_build_job_definition variables: - IMAGE: debian-win32-cross + IMAGE: fedora-win32-cross cross-win64-system: <<: *cross_system_build_job_definition variables: - IMAGE: debian-win64-cross + IMAGE: fedora-win64-crosstests/docker/dockerfiles/fedora-win32-cross.docker new file +23
-0@@ -0,0 +1,42 @@ +FROM fedora:32 + +# Please keep this list sorted alphabetically +ENV PACKAGES \ + bc \ + bzip2 \ + diffutils \ + findutils \ + gcc \ + gettext \ + git \ + hostname \ + make \ + meson \ + mingw32-bzip2 \ + mingw32-curl \ + mingw32-glib2 \ + mingw32-gmp \ + mingw32-gnutls \ + mingw32-gtk3 \ + mingw32-libjpeg-turbo \ + mingw32-libpng \ + mingw32-libtasn1 \
Quoted 8 lines
tests/docker/dockerfiles/fedora-win32-cross.docker line 28
Quoted 5 lines
tests/docker/dockerfiles/fedora-win32-cross.docker new file +5
-0+ mingw32-nettle \ + mingw32-nsis \ + mingw32-pixman \ + mingw32-pkg-config \ + mingw32-SDL2 \It feels like we could be removing the mingw packages from the main fedora.docker now, so it results in smaller images.
I wasn't quite sure whether anybody uses the mingw packages in that main fedora docker image ... Philippe, do you know?
Thomas
Re: [PATCH 7/7] configure: Bump the minimum required Python version to 3.6
In reply to Thomas HuthQuoted 8 lines · Thomas Huth
All our supported build platforms have Python 3.6 or newer nowadays, and there are some useful features in Python 3.6 which are not available in 3.5 yet, so let's bump the minimum Python version to 3.6 now.
Signed-off-by Thomas Huth <[email protected]>--- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 4/7] shippable.yml: Remove the Debian9-based MinGW cross-compiler tests
In reply to Daniel P. BerrangéQuoted 7 lines · Daniel P. Berrangé
Quoted 3 lines · Thomas Huth
We're not supporting Debian 9 anymore, and we are now testing MinGW cross-compiler builds in the gitlab-CI, too, so we do not really need these jobs in the shippable.yml anymore.
For that matter aren't all the other shippable entries obsolete now too since we added
.gitlab-ci.d/crossbuilds.yml?
Yes, they are covered by the gitlab-ci now, too.
Quoted 1 line
IOW, can we remove shippable entirely at this point ?
We likely could ... but I recently had a very quick chat with Alex in IRC, and we agreed to keep them for a while until it's clearer whether we can continue with unlimited CI minutes in gitlab or not.
Thomas
Re: [PATCH 7/7] configure: Bump the minimum required Python version to 3.6
In reply to Thomas HuthQuoted 4 lines · Thomas Huth
All our supported build platforms have Python 3.6 or newer nowadays, and there are some useful features in Python 3.6 which are not available in 3.5 yet, so let's bump the minimum Python version to 3.6 now.
Just to add in case anyone wonders: This isn't incrementalism for incrementalism's sake, but the type hint annotations added in Python 3.6 allow us to statically type the QAPI parser.
We are already using (and enforcing) these annotations in iotests.py, and I believe adding this to QAPI will be of high value going forward.
Quoted 11 lines
Signed-off-by Thomas Huth <[email protected]>--- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)configure +0
-0
configure fi · line 1972
Quoted 10 lines
configure +2
-2@@ -1965,8 +1965,8 @@ fi # Note that if the Python conditional here evaluates True we will exit # with status 1 which is a shell 'false' value. -if ! $python -c 'import sys; sys.exit(sys.version_info < (3,5))'; then - error_exit "Cannot use '$python', Python >= 3.5 is required." \ +if ! $python -c 'import sys; sys.exit(sys.version_info < (3,6))'; then + error_exit "Cannot use '$python', Python >= 3.6 is required." \ "Use --python=/path/to/python to specify a supported Python." fi
Do we need to bump the minimum version in the Sphinx conf, too?
There's also a minimum version check in iotests.py that is now *possibly* redundant, but it does no harm.
Regardless, none of those things cause any harm:
Re: [PATCH 4/7] shippable.yml: Remove the Debian9-based MinGW cross-compiler tests
In reply to Thomas HuthQuoted 3 lines · Thomas Huth
We're not supporting Debian 9 anymore, and we are now testing MinGW cross-compiler builds in the gitlab-CI, too, so we do not really need these jobs in the shippable.yml anymore.
For that matter aren't all the other shippable entries obsolete now too since we added .gitlab-ci.d/crossbuilds.yml ?
IOW, can we remove shippable entirely at this point ?
Quoted 25 lines
Signed-off-by Thomas Huth <[email protected]>--- .shippable.yml | 4 ---- 1 file changed, 4 deletions(-).shippable.yml +0
-4@@ -7,10 +7,6 @@ env: matrix: - IMAGE=debian-amd64 TARGET_LIST=x86_64-softmmu,x86_64-linux-user - - IMAGE=debian-win32-cross - TARGET_LIST=arm-softmmu,i386-softmmu - - IMAGE=debian-win64-cross - TARGET_LIST=aarch64-softmmu,sparc64-softmmu,x86_64-softmmu - IMAGE=debian-armel-cross TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user - IMAGE=debian-armhf-crossSignature · 2 lines
-- 2.18.2
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 6/7] gitlab-ci: Increase the timeout for the cross-compiler builds
In reply to Thomas HuthQuoted 4 lines · Thomas Huth
Some of the cross-compiler builds (the mips build and the win64 build for example) are quite slow and sometimes hit the 1h time limit. Increase the limit a little bit to make sure that we do not get failures in the CI runs just because of some few minutes.
Quoted 21 lines
Signed-off-by Thomas Huth <[email protected]>--- .gitlab-ci.d/crossbuilds.yml | 1 + 1 file changed, 1 insertion(+).gitlab-ci.d/crossbuilds.yml +1
-0@@ -2,6 +2,7 @@ .cross_system_build_job_template: &cross_system_build_job_definition stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + timeout: 80m script: - mkdir build - cd buildSignature · 1 line
2.18.2
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 13 lines · Alex Bennée
Quoted 10 lines · Thomas Huth
Debian 9 is EOL now, and according to our support policy, we do not support it anymore. Let's switch the corresponding CI builds to either Fedora (for a more recent version of the MinGW compilers) or Debian 10 instead.
Together with the Travis patch series that I recently posted ("Update Travis from Xenial to Bionic and Focal"), our CI should now be free of distros that we do not support anymore. And all supported build systems now use at least Python 3.6, so we can drop the support for Python 3.5.
Quoted 4 lines
Quoted 1 line
Based-on: <[email protected]>
I'm inclined to take all of these but I'll take all the CI based ones now and add the 3.6 bump if there is more review/acks for it.
Thanks! ... but I just noticed that I missed to send out the patch that removes the Python 3.5 job in .travis.yml. I just sent it out now, title is "[PATCH 7/6] travis.yml: Drop the Python 3.5 build" ... please make sure to also queue it if you include the patch that bumps the Python version.
Thomas
Daniel P. Berrangé
Reviewed-byRe: [PATCH 1/7] tests/docker: Use Fedora containers for MinGW cross-builds in the gitlab-CI
In reply to Thomas HuthQuoted 99 lines · Thomas Huth
Quoted 89 lines · Daniel P. Berrangé
Quoted 88 lines · Thomas Huth
According to our support policy, we do not support Debian 9 in QEMU anymore, and we only support building the Windows binaries with a very recent version of the MinGW toolchain. So we should not test the MinGW cross-compilation with Debian 9 anymore, but switch to something newer like Fedora. To do this, we need a separate Fedora container for each build that provides the
QEMU_CONFIGURE_OPTSenvironment variable.
Unfortunately, the MinGW 64-bit compiler seems to be a little bit slow, so we also have to disable some features like "capstone" in the build here to make sure that the CI pipelines still finish within a reasonable amount of time.Signed-off-by Thomas Huth <[email protected]>--- .gitlab-ci.d/containers.yml | 10 +++++ .gitlab-ci.d/crossbuilds.yml | 4 +- .../dockerfiles/fedora-win32-cross.docker | 42 +++++++++++++++++++ .../dockerfiles/fedora-win64-cross.docker | 38 +++++++++++++++++ 4 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker create mode 100644 tests/docker/dockerfiles/fedora-win64-cross.docker.gitlab-ci.d/containers.yml +10
-0@@ -248,6 +248,16 @@ i386-fedora-cross-container: variables: NAME: fedora-i386-cross +win32-fedora-cross-container: + <<: *container_job_definition + variables: + NAME: fedora-win32-cross + +win64-fedora-cross-container: + <<: *container_job_definition + variables: + NAME: fedora-win64-cross + amd64-ubuntu1804-container: <<: *container_job_definition variables:.gitlab-ci.d/crossbuilds.yml +2
-2@@ -105,9 +105,9 @@ cross-s390x-user: cross-win32-system: <<: *cross_system_build_job_definition variables: - IMAGE: debian-win32-cross + IMAGE: fedora-win32-cross cross-win64-system: <<: *cross_system_build_job_definition variables: - IMAGE: debian-win64-cross + IMAGE: fedora-win64-crosstests/docker/dockerfiles/fedora-win32-cross.docker new file +23
-0@@ -0,0 +1,42 @@ +FROM fedora:32 + +# Please keep this list sorted alphabetically +ENV PACKAGES \ + bc \ + bzip2 \ + diffutils \ + findutils \ + gcc \ + gettext \ + git \ + hostname \ + make \ + meson \ + mingw32-bzip2 \ + mingw32-curl \ + mingw32-glib2 \ + mingw32-gmp \ + mingw32-gnutls \ + mingw32-gtk3 \ + mingw32-libjpeg-turbo \ + mingw32-libpng \ + mingw32-libtasn1 \Quoted 8 lines
tests/docker/dockerfiles/fedora-win32-cross.docker line 28
Quoted 5 lines
tests/docker/dockerfiles/fedora-win32-cross.docker new file +5
-0+ mingw32-nettle \ + mingw32-nsis \ + mingw32-pixman \ + mingw32-pkg-config \ + mingw32-SDL2 \It feels like we could be removing the mingw packages from the main fedora.docker now, so it results in smaller images.
Quoted 2 lines
I wasn't quite sure whether anybody uses the mingw packages in that main fedora docker image ... Philippe, do you know?
A actually patchew uses this "docker-mingw@fedora".
So I guess we merge this one. Then update patchew, then delete the mingw stuff from @fedora.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 16 lines · Thomas Huth
Quoted 15 lines · Alex Bennée
Quoted 11 lines · Thomas Huth
Debian 9 is EOL now, and according to our support policy, we do not support it anymore. Let's switch the corresponding CI builds to either Fedora (for a more recent version of the MinGW compilers) or Debian 10 instead.
Together with the Travis patch series that I recently posted ("Update Travis from Xenial to Bionic and Focal"), our CI should now be free of distros that we do not support anymore. And all supported build systems now use at least Python 3.6, so we can drop the support for Python 3.5.
Based-on: <[email protected]>
Quoted 8 lines
Quoted 2 lines
I'm inclined to take all of these but I'll take all the CI based ones now and add the 3.6 bump if there is more review/acks for it.
Thanks! ... but I just noticed that I missed to send out the patch that removes the Python 3.5 job in .travis.yml. I just sent it out now, title is "[PATCH 7/6] travis.yml: Drop the Python 3.5 build" ... please make sure to also queue it if you include the patch that bumps the Python version.
I too noticed on my test run, will include it in the re-spin.
Quoted 2 lines
Thomas
Signature · 1 line
Alex Bennée
Re: [PATCH 3/7] tests/docker: Update the tricore container to debian 10
In reply to Thomas HuthQuoted 4 lines · Thomas Huth
We do not support Debian 9 anymore, thus update the Tricore container to Debian 10 now.
Signed-off-by Thomas Huth <[email protected]>
Quoted 46 lines
--- .gitlab-ci.d/containers.yml | 2 +- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-tricore-cross.docker | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-).gitlab-ci.d/containers.yml +1
-1@@ -210,7 +210,7 @@ sparc64-debian-cross-container: tricore-debian-cross-container: <<: *container_job_definition stage: containers-layer2 - needs: ['amd64-debian9-container'] + needs: ['amd64-debian10-container'] variables: NAME: debian-tricore-crosstests/docker/Makefile.include +1
-1@@ -137,7 +137,7 @@ docker-image-debian-sparc64-cross: docker-image-debian10 docker-image-travis: NOUSER=1 # Specialist build images, sometimes very limited tools -docker-image-debian-tricore-cross: docker-image-debian9 +docker-image-debian-tricore-cross: docker-image-debian10 docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-arm64-test-cross: docker-image-debian11tests/docker/dockerfiles/debian-tricore-cross.docker +1
-1@@ -7,7 +7,7 @@ # # SPDX-License-Identifier: GPL-2.0-or-later # -FROM qemu/debian9 +FROM qemu/debian10 MAINTAINER Philippe Mathieu-Daudé <[email protected]>
Re: [PATCH 4/7] shippable.yml: Remove the Debian9-based MinGW cross-compiler tests
In reply to Thomas HuthQuoted 9 lines · Thomas Huth
Quoted 7 lines · Daniel P. Berrangé
Quoted 3 lines · Thomas Huth
We're not supporting Debian 9 anymore, and we are now testing MinGW cross-compiler builds in the gitlab-CI, too, so we do not really need these jobs in the shippable.yml anymore.
For that matter aren't all the other shippable entries obsolete now too since we added
.gitlab-ci.d/crossbuilds.yml?
Quoted 7 lines
Yes, they are covered by the gitlab-ci now, too.
Quoted 1 line
IOW, can we remove shippable entirely at this point ?
We likely could ... but I recently had a very quick chat with Alex in IRC, and we agreed to keep them for a while until it's clearer whether we can continue with unlimited CI minutes in gitlab or not.
As an intermediate step we can pull the docker images from GitLab.
Quoted 3 lines
Thomas
Re: [PATCH 5/7] tests/docker: Remove old Debian 9 containers
In reply to Thomas HuthQuoted 4 lines · Thomas Huth
We do not support Debian 9 in QEMU anymore, and the Debian 9 containers are now no longer used in the gitlab-CI. Time to remove them.
Signed-off-by Thomas Huth <[email protected]>
Quoted 11 lines
--- .gitlab-ci.d/containers.yml | 12 ----- .../dockerfiles/debian-win32-cross.docker | 38 ---------------- .../dockerfiles/debian-win64-cross.docker | 45 ------------------- tests/docker/dockerfiles/debian9-mxe.docker | 21 --------- tests/docker/dockerfiles/debian9.docker | 32 ------------- 5 files changed, 148 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-win32-cross.docker delete mode 100644 tests/docker/dockerfiles/debian-win64-cross.docker delete mode 100644 tests/docker/dockerfiles/debian9-mxe.docker delete mode 100644 tests/docker/dockerfiles/debian9.docker
Yay \o/
Re: [PATCH 6/7] gitlab-ci: Increase the timeout for the cross-compiler builds
In reply to Thomas HuthQuoted 4 lines · Thomas Huth
Some of the cross-compiler builds (the mips build and the win64 build for example) are quite slow and sometimes hit the 1h time limit. Increase the limit a little bit to make sure that we do not get failures in the CI runs just because of some few minutes.
Good idea.
Quoted 19 lines
Signed-off-by Thomas Huth <[email protected]>--- .gitlab-ci.d/crossbuilds.yml | 1 + 1 file changed, 1 insertion(+).gitlab-ci.d/crossbuilds.yml +1
-0@@ -2,6 +2,7 @@ .cross_system_build_job_template: &cross_system_build_job_definition stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + timeout: 80m script: - mkdir build - cd build
Re: [PATCH 7/7] configure: Bump the minimum required Python version to 3.6
In reply to John SnowQuoted 25 lines · John Snow
Quoted 4 lines · Thomas Huth
All our supported build platforms have Python 3.6 or newer nowadays, and there are some useful features in Python 3.6 which are not available in 3.5 yet, so let's bump the minimum Python version to 3.6 now.
Just to add in case anyone wonders: This isn't incrementalism for incrementalism's sake, but the type hint annotations added in Python 3.6 allow us to statically type the QAPI parser.
We are already using (and enforcing) these annotations in
iotests.py, and I believe adding this to QAPI will be of high value going forward.Quoted 11 lines
Signed-off-by Thomas Huth <[email protected]>--- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)configure +0
-0@@ -1965,8 +1965,8 @@ fi
Quoted 12 lines
configure fi · line 1972
Quoted 10 lines
configure +2
-2# Note that if the Python conditional here evaluates True we will exit # with status 1 which is a shell 'false' value. -if ! $python -c 'import sys; sys.exit(sys.version_info < (3,5))'; then - error_exit "Cannot use '$python', Python >= 3.5 is required." \ +if ! $python -c 'import sys; sys.exit(sys.version_info < (3,6))'; then + error_exit "Cannot use '$python', Python >= 3.6 is required." \ "Use --python=/path/to/python to specify a supported Python." fiDo we need to bump the minimum version in the Sphinx conf, too?
Yes -- the configure check only applies to python invoked directly, not to python code invoked via Sphinx, so we should keep both in sync.
thanks
-- PMM
Re: [PATCH 7/7] configure: Bump the minimum required Python version to 3.6
In reply to John SnowQuoted 6 lines · John Snow
Quoted 4 lines · Thomas Huth
All our supported build platforms have Python 3.6 or newer nowadays, and there are some useful features in Python 3.6 which are not available in 3.5 yet, so let's bump the minimum Python version to 3.6 now.
Quoted 6 lines
Just to add in case anyone wonders: This isn't incrementalism for incrementalism's sake, but the type hint annotations added in Python 3.6 allow us to statically type the QAPI parser.
We are already using (and enforcing) these annotations in
iotests.py, and I believe adding this to QAPI will be of high value going forward.
Concur.
[...]
PATCH v2 7/7 configure: Bump the minimum required Python version to 3.6
In reply to Peter MaydellAll our supported build platforms have Python 3.6 or newer nowadays, and there are some useful features in Python 3.6 which are not available in 3.5 yet (e.g. the type hint annotations which will allow us to statically type the QAPI parser), so let's bump the minimum Python version to 3.6 now.
---
v2:
- Bump the version in docs/conf.py, too
- Remove the now unnecessary check in tests/qemu-iotests/iotests.py
configure | 4 ++-- docs/conf.py | 4 ++-- tests/qemu-iotests/iotests.py | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-)
configure +2 -2
@@ -1965,8 +1965,8 @@ fi # Note that if the Python conditional here evaluates True we will exit # with status 1 which is a shell 'false' value. -if ! $python -c 'import sys; sys.exit(sys.version_info < (3,5))'; then - error_exit "Cannot use '$python', Python >= 3.5 is required." \ +if ! $python -c 'import sys; sys.exit(sys.version_info < (3,6))'; then + error_exit "Cannot use '$python', Python >= 3.6 is required." \ "Use --python=/path/to/python to specify a supported Python." fi
docs/conf.py +2 -2
@@ -36,9 +36,9 @@ from sphinx.errors import ConfigError # In newer versions of Sphinx this will display nicely; in older versions # Sphinx will also produce a Python backtrace but at least the information # gets printed... -if sys.version_info < (3,5): +if sys.version_info < (3,6): raise ConfigError( - "QEMU requires a Sphinx that uses Python 3.5 or better\n") + "QEMU requires a Sphinx that uses Python 3.6 or better\n") # The per-manual conf.py will set qemu_docdir for a single-manual build; # otherwise set it here if this is an entire-manual-set build.
tests/qemu-iotests/iotests.py +0 -2
@@ -40,8 +40,6 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) from qemu import qtest from qemu.qmp import QMPMessage -assert sys.version_info >= (3, 6) - # Use this logger for logging messages directly from the iotests module logger = logging.getLogger('qemu.iotests') logger.addHandler(logging.NullHandler())
Signature · 1 line
2.18.2
Re: [PATCH v2 7/7] configure: Bump the minimum required Python version to 3.6
Should we also warning it in meson.build, cause configure finally shoud be removed.
Quoted 5 lines · Thomas Huth
All our supported build platforms have Python 3.6 or newer nowadays, and there are some useful features in Python 3.6 which are not available in 3.5 yet (e.g. the type hint annotations which will allow us to statically type the QAPI parser), so let's bump the minimum Python version to 3.6
now.
Quoted 32 lines
Signed-off-by Thomas Huth <[email protected]>---
v2:
- Bump the version indocs/conf.py, too
- Remove the now unnecessary check intests/qemu-iotests/iotests.pyconfigure | 4 ++-- docs/conf.py | 4 ++-- tests/qemu-iotests/iotests.py | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-)configure +2
-2@@ -1965,8 +1965,8 @@ fi # Note that if the Python conditional here evaluates True we will exit # with status 1 which is a shell 'false' value. -if ! $python -c 'import sys; sys.exit(sys.version_info < (3,5))'; then - error_exit "Cannot use '$python', Python >= 3.5 is required." \ +if ! $python -c 'import sys; sys.exit(sys.version_info < (3,6))'; then + error_exit "Cannot use '$python', Python >= 3.6 is required." \ "Use --python=/path/to/python to specify a supported Python." fidocs/conf.py +0
-0
docs/conf.py from sphinx.errors import ConfigError · line 37
Quoted 2 lines
docs/conf.py +0
-0@@ -36,9 +36,9 @@ from sphinx.errors import ConfigError # In newer versions of Sphinx this will display nicely; in older versions # Sphinx will also produce a Python backtrace but at least the
information
tests/qemu-iotests/iotests.py sys.path.append(os.path.join(os.path.dirname(__file__),
Quoted 14 lines
docs/conf.py +2
-2# gets printed... -if sys.version_info < (3,5): +if sys.version_info < (3,6): raise ConfigError( - "QEMU requires a Sphinx that uses Python 3.5 or better\n") + "QEMU requires a Sphinx that uses Python 3.6 or better\n") # The per-manual conf.py will set qemu_docdir for a single-manual build; # otherwise set it here if this is an entire-manual-set build.tests/qemu-iotests/iotests.py +0
-0@@ -40,8 +40,6 @@ sys.path.append(os.path.join(os.path.dirname(__file__),
'..', '..', 'python'))
Quoted 9 lines
tests/qemu-iotests/iotests.py +0
-3from qemu import qtest from qemu.qmp import QMPMessage -assert sys.version_info >= (3, 6) - # Use this logger for logging messages directly from the iotests module logger = logging.getLogger('qemu.iotests') logger.addHandler(logging.NullHandler()) --
Quoted 3 lines
2.18.2
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
Re: [PATCH v2 7/7] configure: Bump the minimum required Python version to 3.6
Quoted 2 lines · 罗勇刚(Yonggang Luo)
Should we also warning it in meson.build, cause configure finally shoud be removed.
Sounds like a good idea for a separate patch (let's do one issue at a time...).
Thomas