From eafb394242a48410bcd470097b512a9c2df4a2f6 Mon Sep 17 00:00:00 2001 From: Hugo Date: Mon, 1 Apr 2019 16:34:18 +0300 Subject: [PATCH] Drop support for EOL Ubuntu 14.04 (Trusty Tahr) --- .travis.yml | 19 +++---------------- azure-pipelines.yml | 5 ----- docs/installation.rst | 6 +----- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9550eb8f2..ad5f83910 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,32 +26,19 @@ matrix: name: "3.7 Xenial" - python: '2.7' name: "2.7 Xenial" - - python: '2.7' - name: "2.7 Trusty" - dist: trusty - python: "2.7_with_system_site_packages" # For PyQt4 name: "2.7_with_system_site_packages Xenial" services: xvfb - - python: "2.7_with_system_site_packages" # For PyQt4 - name: "2.7_with_system_site_packages Trusty" - dist: trusty - python: '3.6' - name: "3.6 Xenial" - - python: '3.6' - name: "3.6 Trusty PYTHONOPTIMIZE=1" - dist: trusty + name: "3.6 Xenial PYTHONOPTIMIZE=1" env: PYTHONOPTIMIZE=1 - python: '3.5' - name: "3.5 Xenial" - - python: '3.5' - name: "3.5 Trusty PYTHONOPTIMIZE=2" - dist: trusty + name: "3.5 Xenial PYTHONOPTIMIZE=2" env: PYTHONOPTIMIZE=2 - python: "3.8-dev" name: "3.8-dev Xenial" - env: DOCKER="alpine" DOCKER_TAG="master" - env: DOCKER="arch" DOCKER_TAG="master" # contains PyQt5 - - env: DOCKER="ubuntu-trusty-x86" DOCKER_TAG="master" - env: DOCKER="ubuntu-xenial-amd64" DOCKER_TAG="master" - env: DOCKER="debian-stretch-x86" DOCKER_TAG="master" - env: DOCKER="centos-6-amd64" DOCKER_TAG="master" @@ -78,7 +65,7 @@ install: before_script: # Qt needs a display for some of the tests, and it's only run on the system site packages install - | - if [ "$TRAVIS_JOB_NAME" == "2.7_with_system_site_packages Trusty" ]; then + if [ "$TRAVIS_JOB_NAME" == "2.7_with_system_site_packages Xenial" ]; then export DISPLAY=:99.0 sh -e /etc/init.d/xvfb start fi diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bef5eeee6..7f5478c28 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,11 +21,6 @@ jobs: docker: 'arch' name: 'arch' -- template: .azure-pipelines/jobs/test-docker.yml - parameters: - docker: 'ubuntu-trusty-x86' - name: 'ubuntu_trusty_x86' - - template: .azure-pipelines/jobs/test-docker.yml parameters: docker: 'ubuntu-xenial-amd64' diff --git a/docs/installation.rst b/docs/installation.rst index 9179fecc9..eb90d9db6 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -165,7 +165,7 @@ Many of Pillow's features require external libraries: * Pillow has been tested with openjpeg **2.0.0** and **2.1.0**. * Pillow does **not** support the earlier **1.5** series which ships - with Ubuntu <= 14.04 and Debian Jessie. + with Debian Jessie. * **libimagequant** provides improved color quantization @@ -403,10 +403,6 @@ These platforms are built and tested for every change. | Ubuntu Linux 16.04 LTS | 2.7, 3.5, 3.6, 3.7, |x86-64 | | | PyPy, PyPy3 | | +----------------------------------+-------------------------------+-----------------------+ -| Ubuntu Linux 14.04 LTS | 2.7, 3.5, 3.6 |x86-64 | -| +-------------------------------+-----------------------+ -| | 2.7 |x86 | -+----------------------------------+-------------------------------+-----------------------+ | Windows Server 2012 R2 | 2.7, 3.5, 3.6, 3.7 |x86, x86-64 | | +-------------------------------+-----------------------+ | | PyPy, 3.7/MinGW |x86 |