tests/docker, tests/vm: remove setuptools from images

Setuptools is not needed anymore by the bundled copy of meson, remove it. Suggested-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2020-11-25 12:50:48 -05:00 · 2020-11-25 12:50:48 -05:00 · 92ea027017
commit 92ea027017
parent 8e84bf984a
8 changed files with 0 additions and 8 deletions
--- 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 \
--- 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)

--- 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

--- 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

--- a/tests/vm/freebsd
+++ b/tests/vm/freebsd
@ -33,7 +33,6 @@ class FreeBSDVM(basevm.BaseVM):
        "pkgconf",
        "bzip2",
        "python37",
-        "py37-setuptools",
        "ninja",

        # gnu tools
--- 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)
--- 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
--- 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