From f3970110b20c91d54cefbcca28a5b1ccd0ec1943 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 14 Aug 2020 20:09:43 +1000 Subject: [PATCH 1/3] Ignore installed distlib 0.3.0 --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 978d6c67..bb3e3df8 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -33,7 +33,7 @@ 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 olefile pytest pytest-cov && \ /vpy3/bin/pip install numpy --only-binary=:all: || true && \ From 14049a15e977bebb2226e18b908258e553415dc7 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 14 Aug 2020 20:10:37 +1000 Subject: [PATCH 2/3] Upgrade setuptools --- alpine/Dockerfile | 1 + amazon-2-amd64/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index bb3e3df8..c7753916 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -35,6 +35,7 @@ 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 8dab82f7..f3e103e5 100644 --- a/amazon-2-amd64/Dockerfile +++ b/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" From 8bc5a7b2ccbc637851e7d0da229b20ed55ed3e92 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 14 Aug 2020 20:13:02 +1000 Subject: [PATCH 3/3] Archived Python 3.5 jobs --- .travis.yml | 8 -------- Makefile | 2 +- .../debian-9-stretch-x86}/Dockerfile | 0 .../debian-9-stretch-x86}/LICENSE | 0 .../debian-9-stretch-x86}/Makefile | 0 .../debian-9-stretch-x86}/README.txt | 0 .../debian-9-stretch-x86}/test.sh | 0 .../debian-9-stretch-x86}/update.sh | 0 .../ubuntu-16.04-xenial-amd64}/Dockerfile | 0 .../ubuntu-16.04-xenial-amd64}/Makefile | 0 .../ubuntu-16.04-xenial-amd64}/test.sh | 0 .../ubuntu-16.04-xenial-amd64}/update.sh | 0 12 files changed, 1 insertion(+), 9 deletions(-) rename {debian-9-stretch-x86 => archive/debian-9-stretch-x86}/Dockerfile (100%) rename {debian-9-stretch-x86 => archive/debian-9-stretch-x86}/LICENSE (100%) rename {debian-9-stretch-x86 => archive/debian-9-stretch-x86}/Makefile (100%) rename {debian-9-stretch-x86 => archive/debian-9-stretch-x86}/README.txt (100%) rename {debian-9-stretch-x86 => archive/debian-9-stretch-x86}/test.sh (100%) rename {debian-9-stretch-x86 => archive/debian-9-stretch-x86}/update.sh (100%) rename {ubuntu-16.04-xenial-amd64 => archive/ubuntu-16.04-xenial-amd64}/Dockerfile (100%) rename {ubuntu-16.04-xenial-amd64 => archive/ubuntu-16.04-xenial-amd64}/Makefile (100%) rename {ubuntu-16.04-xenial-amd64 => archive/ubuntu-16.04-xenial-amd64}/test.sh (100%) rename {ubuntu-16.04-xenial-amd64 => archive/ubuntu-16.04-xenial-amd64}/update.sh (100%) diff --git a/.travis.yml b/.travis.yml index 88aa21e5..84c42c1d 100644 --- a/.travis.yml +++ b/.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: diff --git a/Makefile b/Makefile index c88372d4..3c617636 100644 --- a/Makefile +++ b/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-%) diff --git a/debian-9-stretch-x86/Dockerfile b/archive/debian-9-stretch-x86/Dockerfile similarity index 100% rename from debian-9-stretch-x86/Dockerfile rename to archive/debian-9-stretch-x86/Dockerfile diff --git a/debian-9-stretch-x86/LICENSE b/archive/debian-9-stretch-x86/LICENSE similarity index 100% rename from debian-9-stretch-x86/LICENSE rename to archive/debian-9-stretch-x86/LICENSE diff --git a/debian-9-stretch-x86/Makefile b/archive/debian-9-stretch-x86/Makefile similarity index 100% rename from debian-9-stretch-x86/Makefile rename to archive/debian-9-stretch-x86/Makefile diff --git a/debian-9-stretch-x86/README.txt b/archive/debian-9-stretch-x86/README.txt similarity index 100% rename from debian-9-stretch-x86/README.txt rename to archive/debian-9-stretch-x86/README.txt diff --git a/debian-9-stretch-x86/test.sh b/archive/debian-9-stretch-x86/test.sh similarity index 100% rename from debian-9-stretch-x86/test.sh rename to archive/debian-9-stretch-x86/test.sh diff --git a/debian-9-stretch-x86/update.sh b/archive/debian-9-stretch-x86/update.sh similarity index 100% rename from debian-9-stretch-x86/update.sh rename to archive/debian-9-stretch-x86/update.sh diff --git a/ubuntu-16.04-xenial-amd64/Dockerfile b/archive/ubuntu-16.04-xenial-amd64/Dockerfile similarity index 100% rename from ubuntu-16.04-xenial-amd64/Dockerfile rename to archive/ubuntu-16.04-xenial-amd64/Dockerfile diff --git a/ubuntu-16.04-xenial-amd64/Makefile b/archive/ubuntu-16.04-xenial-amd64/Makefile similarity index 100% rename from ubuntu-16.04-xenial-amd64/Makefile rename to archive/ubuntu-16.04-xenial-amd64/Makefile diff --git a/ubuntu-16.04-xenial-amd64/test.sh b/archive/ubuntu-16.04-xenial-amd64/test.sh similarity index 100% rename from ubuntu-16.04-xenial-amd64/test.sh rename to archive/ubuntu-16.04-xenial-amd64/test.sh diff --git a/ubuntu-16.04-xenial-amd64/update.sh b/archive/ubuntu-16.04-xenial-amd64/update.sh similarity index 100% rename from ubuntu-16.04-xenial-amd64/update.sh rename to archive/ubuntu-16.04-xenial-amd64/update.sh