From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06751C04EBF for ; Mon, 23 Sep 2019 14:53:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D022420B7C for ; Mon, 23 Sep 2019 14:53:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D022420B7C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCPi8-0004OO-53 for qemu-devel@archiver.kernel.org; Mon, 23 Sep 2019 10:53:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42058) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCPgE-0002eb-4x for qemu-devel@nongnu.org; Mon, 23 Sep 2019 10:51:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCPgB-0002Oo-It for qemu-devel@nongnu.org; Mon, 23 Sep 2019 10:51:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50260) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCPgB-0002OF-Au for qemu-devel@nongnu.org; Mon, 23 Sep 2019 10:51:07 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E82B1307D90D; Mon, 23 Sep 2019 14:51:05 +0000 (UTC) Received: from dhcp-17-179.bos.redhat.com (dhcp-17-179.bos.redhat.com [10.18.17.179]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C44B660166; Mon, 23 Sep 2019 14:50:59 +0000 (UTC) Date: Mon, 23 Sep 2019 10:50:57 -0400 From: Cleber Rosa To: John Snow Subject: Re: [PATCH] docker: move tests from python2 to python3 Message-ID: <20190923145057.GC9445@dhcp-17-179.bos.redhat.com> References: <20190920200049.27216-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190920200049.27216-1-jsnow@redhat.com> User-Agent: Mutt/1.12.1 (2019-06-15) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Mon, 23 Sep 2019 14:51:05 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Alex =?iso-8859-1?Q?Benn=E9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, Sep 20, 2019 at 04:00:49PM -0400, 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+. > > Signed-off-by: John Snow > --- > 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 +-- > tests/docker/dockerfiles/debian9.docker | 2 +- > tests/docker/dockerfiles/ubuntu.docker | 2 +- > tests/docker/dockerfiles/ubuntu1804.docker | 2 +- > 9 files changed, 9 insertions(+), 10 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 \ Good, this gives us Python 3.6 (currently seeing package version 3.6.8-10.el7). > 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 \ On my testing, Python 3.7.4-4 gets installed here at this time. I wonder if this "unstable" distro can/will give us Python 3.8 in the near future and the consequences of that... assuming that's a feature for now. > 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 \ Python 3.7.4-2 gets installed here. > 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 I'm getting Python 3.5.3-1+deb9u1 here, so it LGTM. > > 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 \ Python 3.7.3-2 gets installed here on my testing. > 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 This results in the Python package version 3.4.2-1+deb8u7 being installed, so it's *NOT* enough for the 3.5+ requirements. I suppose it'd be time to retire those distros instead of updating them? > 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 \ Python 3.5.3-1+deb9u1 here, meeting the requirement. > python3-sphinx \ > texinfo \ > $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) > 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 \ Python 3.7.3-2ubuntu0.1 gets installed here, meeting the requirement. > 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 \ Not related to this patch, but the lack of an explicit python3 package line gets to me. :) Anyway, this ends up pulling Python 3.6.7-1~18.04, so LGTM. > python3-sphinx \ > sparse \ > texinfo \ > -- > 2.21.0 > > The only issue I see here is what action to take with regards to debian8.docker. - Cleber.