From 1701c8bc617e0280046dbbfc51c6fff6174d5bca Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 30 Aug 2020 15:31:51 +1000 Subject: [PATCH] Revert "Upgrade setuptools" This reverts commit 14049a15e977bebb2226e18b908258e553415dc7. --- alpine/Dockerfile | 1 - amazon-2-amd64/Dockerfile | 1 - 2 files changed, 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index c7753916..bb3e3df8 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -35,7 +35,6 @@ RUN cd /depends && ./install_webp.sh && ./install_imagequant.sh && ./install_raq RUN /usr/sbin/adduser -D pillow && \ pip3 install -I virtualenv && virtualenv /vpy3 && \ /vpy3/bin/pip install --upgrade pip && \ - /vpy3/bin/pip install --upgrade setuptools>=49.3.2 && \ /vpy3/bin/pip install olefile pytest pytest-cov && \ /vpy3/bin/pip install numpy --only-binary=:all: || true && \ chown -R pillow:pillow /vpy3 diff --git a/amazon-2-amd64/Dockerfile b/amazon-2-amd64/Dockerfile index f3e103e5..8dab82f7 100644 --- a/amazon-2-amd64/Dockerfile +++ b/amazon-2-amd64/Dockerfile @@ -16,7 +16,6 @@ RUN useradd --uid 1000 pillow RUN bash -c "/usr/bin/pip3 install virtualenv && \ /usr/bin/python3 -mvirtualenv -p /usr/bin/python3 --system-site-packages /vpy3 && \ /vpy3/bin/pip install --upgrade pip && \ - /vpy3/bin/pip install --upgrade setuptools>=49.3.2 && \ /vpy3/bin/pip install cffi olefile pytest pytest-cov && \ /vpy3/bin/pip install numpy --only-binary=:all: || true && \ chown -R pillow:pillow /vpy3"