Add 18.04 Bionic, remove EOL 14.04 Trusty

.travis.yml

@@ -1,7 +1,7 @@
 language: python
 notifications:
   irc: chat.freenote.net#pil
-dist: trusty
+dist: xenial
 services:
 - docker
 matrix:
@@ -15,8 +15,8 @@ matrix:
     - env: DOCKER="centos-7-amd64"
     - env: DOCKER="fedora-28-amd64"
     - env: DOCKER="fedora-29-amd64"
-    - env: DOCKER="ubuntu-trusty-x86"
-    - env: DOCKER="ubuntu-xenial-amd64"
+    - env: DOCKER="ubuntu-16.04-xenial-amd64"
+    - env: DOCKER="ubuntu-18.04-bionic-amd64"
     - env: DOCKER="debian-stretch-x86"
 install:
 - sudo apt-get update && sudo apt-get install -qyy debootstrap

Makefile

@@ -1,4 +1,4 @@
-TARGETS = alpine arch amazon-1-amd64 amazon-2-amd64 ubuntu-trusty-x86 ubuntu-xenial-amd64 debian-stretch-x86 fedora-28-amd64 fedora-29-amd64 centos-6-amd64 centos-7-amd64
+TARGETS = alpine arch amazon-1-amd64 amazon-2-amd64 ubuntu-16.04-xenial-amd64 ubuntu-18.04-bionic-amd64 debian-stretch-x86 fedora-28-amd64 fedora-29-amd64 centos-6-amd64 centos-7-amd64
 
 
 BUILDDIRS = $(TARGETS:%=build-%)

alpine/Dockerfile

@@ -34,10 +34,12 @@ RUN cd /depends && ./install_webp.sh && ./install_imagequant.sh && ./install_raq
 
 RUN /usr/sbin/adduser -D pillow && \
     pip install virtualenv && virtualenv /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy && \
     virtualenv -p python3.6 /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3

amazon-1-amd64/Dockerfile

@@ -11,10 +11,12 @@ run yum install -y shadow-utils util-linux xorg-x11-xauth \
 RUN useradd --uid 1000 pillow
 
 RUN bash -c "/usr/bin/virtualenv -p python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy && \
     /usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3"

amazon-2-amd64/Dockerfile

@@ -15,6 +15,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 /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy "

arch/Dockerfile

@@ -35,10 +35,12 @@ RUN cd /depends && ./install_imagequant.sh && ./install_raqm.sh
 
 RUN /sbin/useradd -m -U -u 1000 pillow && \
     virtualenv2 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install nose cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy && \
     virtualenv --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install nose cffi olefile pytest==4.1.1 pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3

ubuntu-trusty-x86/Dockerfile → archive/ubuntu-14.04-trusty-x86/Dockerfile

@@ -46,6 +46,7 @@ RUN useradd pillow && addgroup pillow sudo && \
     mkdir /home/pillow && chown pillow:pillow /home/pillow
 
 RUN virtualenv -p /usr/bin/python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy
@@ -57,4 +58,4 @@ USER pillow
 ENTRYPOINT ["linux32"]
 CMD ["depends/test.sh"]
 
-#docker run -v $TRAVIS_BUILD_DIR:/Pillow pythonpillow/ubuntu-trusty-x86
+#docker run -v $TRAVIS_BUILD_DIR:/Pillow pythonpillow/ubuntu-14.04-trusty-x86

centos-6-amd64/Dockerfile

@@ -12,13 +12,15 @@ RUN useradd --uid 1000 pillow
 
 RUN bash -c "source /opt/rh/python27/enable && \
     /opt/rh/python27/root/usr/bin/virtualenv -p python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     cat /opt/rh/python27/enable /vpy/bin/activate > /vpy/bin/activate2.7 && \
     mv /vpy/bin/activate2.7 /vpy/bin/activate && \
     chown -R pillow:pillow /vpy && \
     source /opt/rh/rh-python36/enable && \
     /opt/rh/rh-python36/root/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     cat /opt/rh/rh-python36/enable /vpy3/bin/activate > /vpy3/bin/activate3.6 && \

centos-7-amd64/Dockerfile

@@ -13,13 +13,15 @@ RUN useradd --uid 1000 pillow
 
 RUN bash -c "source /opt/rh/python27/enable && \
     /opt/rh/python27/root/usr/bin/virtualenv -p python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     cat /opt/rh/python27/enable /vpy/bin/activate > /vpy/bin/activate2.7 && \
     mv /vpy/bin/activate2.7 /vpy/bin/activate && \
     chown -R pillow:pillow /vpy && \
     source /opt/rh/rh-python36/enable && \
     /opt/rh/rh-python36/root/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     cat /opt/rh/rh-python36/enable /vpy3/bin/activate > /vpy3/bin/activate3.6 && \

debian-stretch-x86/Dockerfile

@@ -46,10 +46,12 @@ RUN useradd pillow && addgroup pillow sudo && \
     mkdir /home/pillow && chown pillow:pillow /home/pillow
 
 RUN virtualenv -p /usr/bin/python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy && \
     virtualenv -p /usr/bin/python3.5 --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3

fedora-28-amd64/Dockerfile

@@ -12,10 +12,12 @@ RUN useradd pillow && \
     chown pillow:pillow /home/pillow
 
 RUN virtualenv -p /usr/bin/python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy && \
     virtualenv -p /usr/bin/python3.6 --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3

fedora-29-amd64/Dockerfile

@@ -12,10 +12,12 @@ RUN useradd pillow && \
     chown pillow:pillow /home/pillow
 
 RUN /usr/bin/python2.7 /usr/lib/python2.7/site-packages/virtualenv.py --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy && \
     /usr/bin/python3.7 /usr/lib/python3.7/site-packages/virtualenv.py --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3

ubuntu-xenial-amd64/Dockerfile → ubuntu-16.04-xenial-amd64/Dockerfile

@@ -15,10 +15,12 @@ RUN useradd pillow && addgroup pillow sudo && \
     mkdir /home/pillow && chown pillow:pillow /home/pillow
 
 RUN virtualenv -p /usr/bin/python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy && \
     virtualenv -p /usr/bin/python3.5 --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3
@@ -29,4 +31,4 @@ RUN cd /depends && ./install_openjpeg.sh && ./install_imagequant.sh && ./install
 USER pillow
 CMD ["depends/test.sh"]
 
-#docker run -v $TRAVIS_BUILD_DIR:/Pillow pythonpillow/ubuntu-xenial-amd64
+#docker run -v $TRAVIS_BUILD_DIR:/Pillow pythonpillow/ubuntu-16.04-xenial-amd64

ubuntu-18.04-bionic-amd64/Dockerfile

@@ -0,0 +1,32 @@
+FROM ubuntu:bionic
+
+RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y \
+    install sudo xvfb \
+    git wget python-virtualenv python-numpy python-scipy netpbm \
+    python-pyqt5 ghostscript libffi-dev libjpeg-turbo-progs \
+    python-dev python-setuptools \
+    python3-dev cmake  \
+    libtiff5-dev libjpeg8-dev zlib1g-dev \
+    libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev \
+    python-tk python3-tk \
+    libharfbuzz-dev libfribidi-dev && apt-get clean
+
+RUN useradd pillow && addgroup pillow sudo && \
+    mkdir /home/pillow && chown pillow:pillow /home/pillow
+
+RUN virtualenv -p /usr/bin/python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
+    /vpy/bin/pip install cffi olefile pytest pytest-cov && \
+    chown -R pillow:pillow /vpy && \
+    virtualenv -p /usr/bin/python3.6 --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
+    /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
+    chown -R pillow:pillow /vpy3
+
+ADD depends /depends
+RUN cd /depends && ./install_openjpeg.sh && ./install_imagequant.sh && ./install_raqm.sh
+
+USER pillow
+CMD ["depends/test.sh"]
+
+#docker run -v $TRAVIS_BUILD_DIR:/Pillow pythonpillow/ubuntu-ubuntu-18.04-bionic-amd64-amd64

ubuntu-18.04-bionic-amd64/Makefile

@@ -0,0 +1 @@
+../Makefile.sub

ubuntu-18.04-bionic-amd64/test.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+source /vpy/bin/activate
+cd /Pillow
+make clean
+make install-coverage
+/usr/bin/xvfb-run -a pytest -vx --cov PIL --cov-report term Tests
+
+source /vpy3/bin/activate
+cd /Pillow
+make clean
+make install-coverage
+/usr/bin/xvfb-run -a pytest -vx --cov PIL --cov-report term Tests

ubuntu-18.04-bionic-amd64/update.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+docker pull ubuntu:bionic