| Message ID | 20180115170243.24578-14-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Support building with py2 or py3 | expand |
On 01/16/2018 01:02 AM, Daniel P. Berrange wrote: > Fedora has switched to Python 3 by default, so it makes sense to use that > for testing QEMU builds, so we get testing of Python 3 compatibility. > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > --- > tests/docker/dockerfiles/fedora.docker | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker > index 4b26c3aded..a22fe16157 100644 > --- a/tests/docker/dockerfiles/fedora.docker > +++ b/tests/docker/dockerfiles/fedora.docker > @@ -1,6 +1,6 @@ > FROM fedora:latest > ENV PACKAGES \ > - ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \ > + ccache gettext git tar PyYAML sparse flex bison python3 bzip2 hostname \ > glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ > gcc gcc-c++ clang make perl which bc findutils libaio-devel \ > nettle-devel \ > @@ -12,6 +12,7 @@ ENV PACKAGES \ > mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \ > mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \ > mingw64-bzip2 > +ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 > > RUN dnf install -y $PACKAGES > RUN rpm -q $PACKAGES | sort > /packages.txt QAPI changes stands out in the series' diffstat, so: Reviewed-by: Fam Zheng <famz@redhat.com> Acked-by: Fam Zheng <famz@redhat.com>
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 4b26c3aded..a22fe16157 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,6 +1,6 @@ FROM fedora:latest ENV PACKAGES \ - ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \ + ccache gettext git tar PyYAML sparse flex bison python3 bzip2 hostname \ glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ gcc gcc-c++ clang make perl which bc findutils libaio-devel \ nettle-devel \ @@ -12,6 +12,7 @@ ENV PACKAGES \ mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \ mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \ mingw64-bzip2 +ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt
Fedora has switched to Python 3 by default, so it makes sense to use that for testing QEMU builds, so we get testing of Python 3 compatibility. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- tests/docker/dockerfiles/fedora.docker | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)