Merge pull request #81 from radarhere/fixes

.travis.yml

@@ -25,14 +25,10 @@ matrix:
       env: DOCKER="fedora-31-amd64"
     - name: "fedora-32-amd64 stable"
       env: DOCKER="fedora-32-amd64"
-    - name: "ubuntu-16.04-xenial-amd64 stable"
-      env: DOCKER="ubuntu-16.04-xenial-amd64"
     - name: "ubuntu-18.04-bionic-amd64 stable"
       env: DOCKER="ubuntu-18.04-bionic-amd64"
     - name: "ubuntu-20.04-focal-amd64 stable"
       env: DOCKER="ubuntu-20.04-focal-amd64"
-    - name: "debian-9-stretch-x86 stable"
-      env: DOCKER="debian-9-stretch-x86"
     - name: "debian-10-buster-x86 stable"
       env: DOCKER="debian-10-buster-x86"
     - name: "alpine latest"
@@ -53,14 +49,10 @@ matrix:
       env: DOCKER="fedora-31-amd64" LATEST="true"
     - name: "fedora-32-amd64 latest"
       env: DOCKER="fedora-32-amd64" LATEST="true"
-    - name: "ubuntu-16.04-xenial-amd64 latest"
-      env: DOCKER="ubuntu-16.04-xenial-amd64" LATEST="true"
     - name: "ubuntu-18.04-bionic-amd64 latest"
       env: DOCKER="ubuntu-18.04-bionic-amd64" LATEST="true"
     - name: "ubuntu-20.04-focal-amd64 latest"
       env: DOCKER="ubuntu-20.04-focal-amd64" LATEST="true"
-    - name: "debian-9-stretch-x86 latest"
-      env: DOCKER="debian-9-stretch-x86" LATEST="true"
     - name: "debian-10-buster-x86 latest"
       env: DOCKER="debian-10-buster-x86" LATEST="true"
 install:

Makefile

@@ -1,4 +1,4 @@
-TARGETS = alpine arch amazon-1-amd64 amazon-2-amd64 ubuntu-16.04-xenial-amd64 ubuntu-18.04-bionic-amd64 ubuntu-20.04-focal-amd64 debian-9-stretch-x86 debian-10-buster-x86 fedora-31-amd64 fedora-32-amd64 centos-6-amd64 centos-7-amd64 centos-8-amd64
+TARGETS = alpine arch amazon-1-amd64 amazon-2-amd64 ubuntu-18.04-bionic-amd64 ubuntu-20.04-focal-amd64 debian-10-buster-x86 fedora-31-amd64 fedora-32-amd64 centos-6-amd64 centos-7-amd64 centos-8-amd64
 
 
 BUILDDIRS = $(TARGETS:%=build-%)

alpine/Dockerfile

@@ -33,8 +33,9 @@ ADD depends /depends
 RUN cd /depends && ./install_webp.sh && ./install_imagequant.sh && ./install_raqm.sh
 
 RUN /usr/sbin/adduser -D pillow && \
-    pip3 install virtualenv && virtualenv /vpy3 && \
+    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

amazon-2-amd64/Dockerfile

@@ -16,6 +16,7 @@ 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"