All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Alex Bennée" <alex.bennee@linaro.org>, qemu-devel@nongnu.org
Cc: Fam Zheng <fam@euphon.net>, jsnow@redhat.com, f4bug@amsat.org
Subject: Re: [PATCH v3 32/33] docker: move tests from python2 to python3
Date: Thu, 26 Sep 2019 00:22:26 +0200	[thread overview]
Message-ID: <a9bf1bae-baa5-f209-c814-a73567933f55@redhat.com> (raw)
In-Reply-To: <20190924210106.27117-33-alex.bennee@linaro.org>

On 9/24/19 11:01 PM, Alex Bennée wrote:
> From: John Snow <jsnow@redhat.com>
> 
> As part of the push to drop python2 support, replace any explicit python2
> dependencies with python3 versions.
> 
> For centos, python2 still exists as an implicit dependency, but by adding
> python3 we will be able to build even if the configure script begins to
> require python 3.5+.
> 
> Tested with centos7, fedora, ubuntu, ubuntu1804, and debian 9 (amd64).
> Tested under a custom configure script that requires Python 3.5+.
> 
> the travis dockerfile is also moved to using python3, which was tested
> by running `make docker-test-build@travis`, which I hope is sufficient.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> Message-Id: <20190923181140.7235-7-jsnow@redhat.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  tests/docker/dockerfiles/centos7.docker             | 2 +-
>  tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +-
>  tests/docker/dockerfiles/debian10.docker            | 2 +-
>  tests/docker/dockerfiles/debian9.docker             | 2 +-
>  tests/docker/dockerfiles/travis.docker              | 2 +-
>  tests/docker/dockerfiles/ubuntu.docker              | 2 +-
>  tests/docker/dockerfiles/ubuntu1804.docker          | 2 +-
>  7 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
> index e0b9d7dbe9f..953637065c4 100644
> --- a/tests/docker/dockerfiles/centos7.docker
> +++ b/tests/docker/dockerfiles/centos7.docker
> @@ -25,6 +25,7 @@ ENV PACKAGES \
>      nettle-devel \
>      perl-Test-Harness \
>      pixman-devel \
> +    python3 \
>      SDL-devel \
>      spice-glib-devel \
>      spice-server-devel \
> @@ -34,4 +35,3 @@ ENV PACKAGES \
>      zlib-devel
>  RUN yum install -y $PACKAGES
>  RUN rpm -q $PACKAGES | sort > /packages.txt
> -
> diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/docker/dockerfiles/debian-xtensa-cross.docker
> index b9c2e2e5317..e6f93f65ee2 100644
> --- a/tests/docker/dockerfiles/debian-xtensa-cross.docker
> +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker
> @@ -18,7 +18,7 @@ RUN apt-get update && \
>          flex \
>          gettext \
>          git \
> -        python-minimal
> +        python3-minimal
>  
>  ENV CPU_LIST csp dc232b dc233c
>  ENV TOOLCHAIN_RELEASE 2018.02
> diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker
> index 30a78813f27..dad498b52e3 100644
> --- a/tests/docker/dockerfiles/debian10.docker
> +++ b/tests/docker/dockerfiles/debian10.docker
> @@ -26,7 +26,7 @@ RUN apt update && \
>          git \
>          pkg-config \
>          psmisc \
> -        python \
> +        python3 \
>          python3-sphinx \
>          texinfo \
>          $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\  -f2)
> diff --git a/tests/docker/dockerfiles/debian9.docker b/tests/docker/dockerfiles/debian9.docker
> index b36f1d4ed83..8cbd742bb5f 100644
> --- a/tests/docker/dockerfiles/debian9.docker
> +++ b/tests/docker/dockerfiles/debian9.docker
> @@ -26,7 +26,7 @@ RUN apt update && \
>          git \
>          pkg-config \
>          psmisc \
> -        python \
> +        python3 \
>          python3-sphinx \
>          texinfo \
>          $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\  -f2)
> diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker
> index e72dc85ca7a..ea14da29d97 100644
> --- a/tests/docker/dockerfiles/travis.docker
> +++ b/tests/docker/dockerfiles/travis.docker
> @@ -5,7 +5,7 @@ ENV LC_ALL en_US.UTF-8
>  RUN sed -i "s/# deb-src/deb-src/" /etc/apt/sources.list
>  RUN apt-get update
>  RUN apt-get -y build-dep qemu
> -RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools gcovr
> +RUN apt-get -y install device-tree-compiler python3 python3-yaml dh-autoreconf gdb strace lsof net-tools gcovr
>  # Travis tools require PhantomJS / Neo4j / Maven accessible
>  # in their PATH (QEMU build won't access them).
>  ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
> diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
> index a4f601395c8..f4864922240 100644
> --- a/tests/docker/dockerfiles/ubuntu.docker
> +++ b/tests/docker/dockerfiles/ubuntu.docker
> @@ -60,7 +60,7 @@ ENV PACKAGES flex bison \
>      libvte-2.91-dev \
>      libxen-dev \
>      make \
> -    python-yaml \
> +    python3-yaml \
>      python3-sphinx \
>      sparse \
>      texinfo \
> diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
> index 883f9bcf31c..3cc4f492c4a 100644
> --- a/tests/docker/dockerfiles/ubuntu1804.docker
> +++ b/tests/docker/dockerfiles/ubuntu1804.docker
> @@ -47,7 +47,7 @@ ENV PACKAGES flex bison \
>      libvte-2.91-dev \
>      libxen-dev \
>      make \
> -    python-yaml \
> +    python3-yaml \
>      python3-sphinx \
>      sparse \
>      texinfo \
> 


  reply	other threads:[~2019-09-25 22:24 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-24 21:00 [PATCH v3 00/33] testing/next (docker,tcg, alpha ;-) Alex Bennée
2019-09-24 21:00 ` [PATCH v3 01/33] target/alpha: Use array for FPCR_DYN conversion Alex Bennée
2019-09-25 22:35   ` Philippe Mathieu-Daudé
2019-09-24 21:00 ` [PATCH v3 02/33] target/alpha: Fix SWCR_MAP_UMZ Alex Bennée
2019-09-24 21:00 ` [PATCH v3 03/33] target/alpha: Fix SWCR_TRAP_ENABLE_MASK Alex Bennée
2019-09-25 22:35   ` Philippe Mathieu-Daudé
2019-09-24 21:00 ` [PATCH v3 04/33] target/alpha: Handle SWCR_MAP_DMZ earlier Alex Bennée
2019-09-24 21:00 ` [PATCH v3 05/33] target/alpha: Write to fpcr_flush_to_zero once Alex Bennée
2019-09-24 21:00 ` [PATCH v3 06/33] target/alpha: Mask IOV exception with INV for user-only Alex Bennée
2019-09-24 21:00 ` [PATCH v3 07/33] target/alpha: Tidy helper_fp_exc_raise_s Alex Bennée
2019-09-25 22:30   ` Philippe Mathieu-Daudé
2019-09-24 21:00 ` [PATCH v3 08/33] tests/migration: Fail on unexpected migration states Alex Bennée
2019-09-25 22:30   ` Philippe Mathieu-Daudé
2019-09-24 21:00 ` [PATCH v3 09/33] tests/migration/postcopy: trim migration bandwidth Alex Bennée
2019-09-24 21:00 ` [PATCH v3 10/33] migration/postcopy: Recognise the recovery states as 'in_postcopy' Alex Bennée
2019-09-24 21:00 ` [PATCH v3 11/33] target/ppc: fix signal delivery for ppc64abi32 Alex Bennée
2019-09-24 21:00 ` [PATCH v3 12/33] tests/docker: add sanitizers back to clang build Alex Bennée
2019-09-24 21:00 ` [PATCH v3 13/33] tests/docker: fix DOCKER_PARTIAL_IMAGES Alex Bennée
2019-09-24 21:00 ` [PATCH v3 14/33] tests/docker: remove python2.7 from debian9-mxe Alex Bennée
2019-09-25 22:27   ` Philippe Mathieu-Daudé
2019-09-24 21:00 ` [PATCH v3 15/33] tests/docker: reduce scary warnings by cleaning up clean up Alex Bennée
2019-09-25 18:55   ` Richard Henderson
2019-09-24 21:00 ` [PATCH v3 16/33] podman: fix command invocation Alex Bennée
2019-09-25 12:36   ` Thomas Huth
2019-09-24 21:00 ` [PATCH v3 17/33] tests/tcg: clean-up some comments after the de-tangling Alex Bennée
2019-09-25 22:07   ` Philippe Mathieu-Daudé
2019-09-25 22:10     ` Philippe Mathieu-Daudé
2019-09-24 21:00 ` [PATCH v3 18/33] tests/tcg: re-enable linux-test for ppc64abi32 Alex Bennée
2019-09-25 18:54   ` Richard Henderson
2019-09-25 22:13   ` Philippe Mathieu-Daudé
2019-09-24 21:00 ` [PATCH v3 19/33] tests/tcg: add float_madds test to multiarch Alex Bennée
2019-09-25 22:17   ` Philippe Mathieu-Daudé
2019-09-24 21:00 ` [PATCH v3 20/33] tests/tcg: add generic version of float_convs Alex Bennée
2019-09-25 22:26   ` Philippe Mathieu-Daudé
2019-09-24 21:00 ` [PATCH v3 21/33] tests/tcg: add simple record/replay smoke test for aarch64 Alex Bennée
2019-09-25 22:20   ` Philippe Mathieu-Daudé
2019-09-24 21:00 ` [PATCH v3 22/33] configure: preserve PKG_CONFIG for subdir builds Alex Bennée
2019-09-25 22:25   ` Philippe Mathieu-Daudé
2019-09-24 21:00 ` [PATCH v3 23/33] docs/devel: add "check-tcg" to testing.rst Alex Bennée
2019-09-25 18:58   ` Richard Henderson
2019-09-25 22:16   ` Philippe Mathieu-Daudé
2019-09-24 21:00 ` [PATCH v3 24/33] target/i386: Fix broken build with WHPX enabled Alex Bennée
2019-09-24 21:00 ` [PATCH v3 25/33] tests/docker: Add fedora-win10sdk-cross image Alex Bennée
2019-09-25 20:27   ` Philippe Mathieu-Daudé
2019-09-25 21:08     ` Alex Bennée
2019-09-24 21:00 ` [PATCH v3 26/33] .shippable.yml: Build WHPX enabled binaries Alex Bennée
2019-09-24 21:01 ` [PATCH v3 27/33] docker: remove debian8-mxe definitions Alex Bennée
2019-09-24 21:01 ` [PATCH v3 28/33] docker: removed unused debian8 partial image Alex Bennée
2019-09-25 12:43   ` Philippe Mathieu-Daudé
2019-09-24 21:01 ` [PATCH v3 29/33] docker: remove 'deprecated' image definitions Alex Bennée
2019-09-25 22:23   ` Philippe Mathieu-Daudé
2019-09-25 23:34     ` Alex Bennée
2019-09-26  4:28       ` Philippe Mathieu-Daudé
2019-09-26 16:04         ` Alex Bennée
2019-09-26 16:08           ` Philippe Mathieu-Daudé
2019-09-26 17:38             ` John Snow
2019-09-24 21:01 ` [PATCH v3 30/33] docker: remove unused debian-ports Alex Bennée
2019-09-25 22:23   ` Philippe Mathieu-Daudé
2019-09-24 21:01 ` [PATCH v3 31/33] docker: remove unused debian-sid Alex Bennée
2019-09-25 22:22   ` Philippe Mathieu-Daudé
2019-09-24 21:01 ` [PATCH v3 32/33] docker: move tests from python2 to python3 Alex Bennée
2019-09-25 22:22   ` Philippe Mathieu-Daudé [this message]
2019-09-24 21:01 ` [PATCH v3 33/33] tests/docker: remove debian-powerpc-user-cross Alex Bennée
2019-09-25 18:57   ` Richard Henderson
2019-09-25 22:21   ` Philippe Mathieu-Daudé
2019-09-27 12:08 ` [PATCH v3 00/33] testing/next (docker,tcg, alpha ;-) no-reply

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=a9bf1bae-baa5-f209-c814-a73567933f55@redhat.com \
    --to=philmd@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=f4bug@amsat.org \
    --cc=fam@euphon.net \
    --cc=jsnow@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.