Re: [PATCH] tests/docker, tests/vm: remove setuptools from images

2020-11-26 Thread Paolo Bonzini 

On 25/11/20 19:20, Thomas Huth wrote:

On 25/11/2020 18.50, Paolo Bonzini wrote:

Setuptools is not needed anymore by the bundled copy of meson,
remove it.

Suggested-by: Thomas Huth 
Signed-off-by: Paolo Bonzini 
---
  .cirrus.yml| 1 -
  tests/docker/dockerfiles/debian10.docker   | 1 -
  tests/docker/dockerfiles/fedora-win32-cross.docker | 1 -
  tests/docker/dockerfiles/fedora-win64-cross.docker | 1 -
  tests/vm/freebsd   | 1 -
  tests/vm/haiku.x86_64  | 1 -
  tests/vm/netbsd| 1 -
  tests/vm/openbsd   | 1 -
  8 files changed, 8 deletions(-)


Needs to go in after the patch that removes the check in the configure
script. Then:

Reviewed-by: Thomas Huth 


Queued both for pull request, thanks.

Paolo

Re: [PATCH] tests/docker, tests/vm: remove setuptools from images

2020-11-25 Thread Thomas Huth 
On 25/11/2020 18.50, Paolo Bonzini wrote:
> Setuptools is not needed anymore by the bundled copy of meson,
> remove it.
> 
> Suggested-by: Thomas Huth 
> Signed-off-by: Paolo Bonzini 
> ---
>  .cirrus.yml| 1 -
>  tests/docker/dockerfiles/debian10.docker   | 1 -
>  tests/docker/dockerfiles/fedora-win32-cross.docker | 1 -
>  tests/docker/dockerfiles/fedora-win64-cross.docker | 1 -
>  tests/vm/freebsd   | 1 -
>  tests/vm/haiku.x86_64  | 1 -
>  tests/vm/netbsd| 1 -
>  tests/vm/openbsd   | 1 -
>  8 files changed, 8 deletions(-)

Needs to go in after the patch that removes the check in the configure
script. Then:

Reviewed-by: Thomas Huth

[PATCH] tests/docker, tests/vm: remove setuptools from images

2020-11-25 Thread Paolo Bonzini 
Setuptools is not needed anymore by the bundled copy of meson,
remove it.

Suggested-by: Thomas Huth 
Signed-off-by: Paolo Bonzini 
---
 .cirrus.yml| 1 -
 tests/docker/dockerfiles/debian10.docker   | 1 -
 tests/docker/dockerfiles/fedora-win32-cross.docker | 1 -
 tests/docker/dockerfiles/fedora-win64-cross.docker | 1 -
 tests/vm/freebsd   | 1 -
 tests/vm/haiku.x86_64  | 1 -
 tests/vm/netbsd| 1 -
 tests/vm/openbsd   | 1 -
 8 files changed, 8 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index f0209b7a3e..2e45b3254f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -85,7 +85,6 @@ windows_msys2_task:
 C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed \
   diffutils git grep make pkg-config sed \
   mingw-w64-x86_64-python \
-  mingw-w64-x86_64-python-setuptools \
   mingw-w64-x86_64-toolchain \
   mingw-w64-x86_64-SDL2 \
   mingw-w64-x86_64-SDL2_image \
diff --git a/tests/docker/dockerfiles/debian10.docker 
b/tests/docker/dockerfiles/debian10.docker
index 21cc671d71..73a3caac9c 100644
--- a/tests/docker/dockerfiles/debian10.docker
+++ b/tests/docker/dockerfiles/debian10.docker
@@ -30,7 +30,6 @@ RUN apt update && \
 pkg-config \
 psmisc \
 python3 \
-python3-setuptools \
 python3-sphinx \
 $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\  
-f2)
 
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker 
b/tests/docker/dockerfiles/fedora-win32-cross.docker
index 5903e1b0b4..087df598a0 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -30,7 +30,6 @@ ENV PACKAGES \
 perl-Test-Harness \
 python3 \
 python3-PyYAML \
-python3-setuptools \
 tar \
 which
 
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker 
b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 7f03cd8ffc..d5d2f5f00d 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -26,7 +26,6 @@ ENV PACKAGES \
 perl-Test-Harness \
 python3 \
 python3-PyYAML \
-python3-setuptools \
 tar \
 which
 
diff --git a/tests/vm/freebsd b/tests/vm/freebsd
index 04ee793381..09f3ee6cb8 100755
--- a/tests/vm/freebsd
+++ b/tests/vm/freebsd
@@ -33,7 +33,6 @@ class FreeBSDVM(basevm.BaseVM):
 "pkgconf",
 "bzip2",
 "python37",
-"py37-setuptools",
 "ninja",
 
 # gnu tools
diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64
index 37af48bf1b..2eb736dae1 100755
--- a/tests/vm/haiku.x86_64
+++ b/tests/vm/haiku.x86_64
@@ -77,7 +77,6 @@ class HaikuVM(basevm.BaseVM):
 "devel:libusb_1.0",
 "devel:libz",
 "ninja",
-"setuptools_python3"
 ]
 
 # https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 
(reversed order)
diff --git a/tests/vm/netbsd b/tests/vm/netbsd
index 596717cc76..b9efc269d2 100755
--- a/tests/vm/netbsd
+++ b/tests/vm/netbsd
@@ -31,7 +31,6 @@ class NetBSDVM(basevm.BaseVM):
 "pkgconf",
 "xz",
 "python37",
-"py37-setuptools",
 "ninja-build",
 
 # gnu tools
diff --git a/tests/vm/openbsd b/tests/vm/openbsd
index 386b2c72f7..4d1399378e 100755
--- a/tests/vm/openbsd
+++ b/tests/vm/openbsd
@@ -30,7 +30,6 @@ class OpenBSDVM(basevm.BaseVM):
 "git",
 "pkgconf",
 "bzip2", "xz",
-"py3-setuptools",
 "ninja",
 
 # gnu tools
-- 
2.26.2