On 9/21/19 12:12 AM, John Snow wrote:
> 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 <js...@redhat.com>
> Message-id: 20190920200049.27216-1-js...@redhat.com
^ remove
v1 has:
Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> tests/docker/dockerfiles/centos7.docker | 2 +-
> tests/docker/dockerfiles/debian-ports.docker | 2 +-
> tests/docker/dockerfiles/debian-sid.docker | 2 +-
> tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +-
> tests/docker/dockerfiles/debian10.docker | 2 +-
> tests/docker/dockerfiles/debian8.docker | 3 +--
If you queue this patch at the end of your series, no need to patch
debian8.docker.
Anyway,
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> tests/docker/dockerfiles/debian9.docker | 2 +-
> tests/docker/dockerfiles/travis.docker | 2 +-
> tests/docker/dockerfiles/ubuntu.docker | 2 +-
> tests/docker/dockerfiles/ubuntu1804.docker | 2 +-
> 10 files changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/centos7.docker
> b/tests/docker/dockerfiles/centos7.docker
> index e0b9d7dbe9..953637065c 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-ports.docker
> b/tests/docker/dockerfiles/debian-ports.docker
> index 61bc3f2993..f1ea8d3bd1 100644
> --- a/tests/docker/dockerfiles/debian-ports.docker
> +++ b/tests/docker/dockerfiles/debian-ports.docker
> @@ -31,6 +31,6 @@ RUN apt-get update && \
> git \
> pkg-config \
> psmisc \
> - python \
> + python3 \
> texinfo \
> $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\
> -f2)
> diff --git a/tests/docker/dockerfiles/debian-sid.docker
> b/tests/docker/dockerfiles/debian-sid.docker
> index 2a1bcc33b2..dcb8e83715 100644
> --- a/tests/docker/dockerfiles/debian-sid.docker
> +++ b/tests/docker/dockerfiles/debian-sid.docker
> @@ -31,5 +31,5 @@ RUN apt update && \
> git \
> pkg-config \
> psmisc \
> - python \
> + python3 \
> texinfo || { echo "Failed to build - see debian-sid.docker notes";
> exit 1; }
> diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker
> b/tests/docker/dockerfiles/debian-xtensa-cross.docker
> index b9c2e2e531..e6f93f65ee 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 30a78813f2..dad498b52e 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/debian8.docker
> b/tests/docker/dockerfiles/debian8.docker
> index 1212a85c35..be67023826 100644
> --- a/tests/docker/dockerfiles/debian8.docker
> +++ b/tests/docker/dockerfiles/debian8.docker
> @@ -30,5 +30,4 @@ RUN apt update && \
> git \
> gnupg \
> pkg-config \
> - python-minimal
> -
> + python3-minimal
> diff --git a/tests/docker/dockerfiles/debian9.docker
> b/tests/docker/dockerfiles/debian9.docker
> index b36f1d4ed8..8cbd742bb5 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 e72dc85ca7..ea14da29d9 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 a4f601395c..f486492224 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 883f9bcf31..3cc4f492c4 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 \
>
