mirror of
				https://github.com/python-pillow/Pillow.git
				synced 2025-10-31 07:57:27 +03:00 
			
		
		
		
	Merge pull request #3765 from hugovk/rm-eol-trusty
Drop support for EOL Ubuntu 14.04 (Trusty Tahr)
This commit is contained in:
		
						commit
						b636dde501
					
				
							
								
								
									
										27
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										27
									
								
								.travis.yml
									
									
									
									
									
								
							|  | @ -18,40 +18,25 @@ matrix: | ||||||
|       env: LINT="true" |       env: LINT="true" | ||||||
|     - python: "pypy2.7-6.0" |     - python: "pypy2.7-6.0" | ||||||
|       name: "PyPy2 Xenial" |       name: "PyPy2 Xenial" | ||||||
|       dist: xenial |  | ||||||
|     - python: "pypy3.5-6.0" |     - python: "pypy3.5-6.0" | ||||||
|       name: "PyPy3 Xenial" |       name: "PyPy3 Xenial" | ||||||
|       dist: xenial |  | ||||||
|     - python: '3.7' |     - python: '3.7' | ||||||
|       name: "3.7 Xenial" |       name: "3.7 Xenial" | ||||||
|     - python: '2.7' |     - python: '2.7' | ||||||
|       name: "2.7 Xenial" |       name: "2.7 Xenial" | ||||||
|     - python: '2.7' |  | ||||||
|       name: "2.7 Trusty" |  | ||||||
|       dist: trusty |  | ||||||
|     - python:  "2.7_with_system_site_packages" # For PyQt4 |     - python:  "2.7_with_system_site_packages" # For PyQt4 | ||||||
|       name: "2.7_with_system_site_packages Xenial" |       name: "2.7_with_system_site_packages Xenial" | ||||||
|       services: xvfb |       services: xvfb | ||||||
|     - python:  "2.7_with_system_site_packages" # For PyQt4 |  | ||||||
|       name: "2.7_with_system_site_packages Trusty" |  | ||||||
|       dist: trusty |  | ||||||
|     - python: '3.6' |     - python: '3.6' | ||||||
|       name: "3.6 Xenial" |       name: "3.6 Xenial PYTHONOPTIMIZE=1" | ||||||
|     - python: '3.6' |  | ||||||
|       name: "3.6 Trusty PYTHONOPTIMIZE=1" |  | ||||||
|       dist: trusty |  | ||||||
|       env: PYTHONOPTIMIZE=1 |       env: PYTHONOPTIMIZE=1 | ||||||
|     - python: '3.5' |     - python: '3.5' | ||||||
|       name: "3.5 Xenial" |       name: "3.5 Xenial PYTHONOPTIMIZE=2" | ||||||
|     - python: '3.5' |  | ||||||
|       name: "3.5 Trusty PYTHONOPTIMIZE=2" |  | ||||||
|       dist: trusty |  | ||||||
|       env: PYTHONOPTIMIZE=2 |       env: PYTHONOPTIMIZE=2 | ||||||
|     - python: "3.8-dev" |     - python: "3.8-dev" | ||||||
|       name: "3.8-dev Xenial" |       name: "3.8-dev Xenial" | ||||||
|     - env: DOCKER="alpine" DOCKER_TAG="master" |     - env: DOCKER="alpine" DOCKER_TAG="master" | ||||||
|     - env: DOCKER="arch" DOCKER_TAG="master" # contains PyQt5 |     - 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="ubuntu-xenial-amd64" DOCKER_TAG="master" | ||||||
|     - env: DOCKER="debian-stretch-x86" DOCKER_TAG="master" |     - env: DOCKER="debian-stretch-x86" DOCKER_TAG="master" | ||||||
|     - env: DOCKER="centos-6-amd64" DOCKER_TAG="master" |     - env: DOCKER="centos-6-amd64" DOCKER_TAG="master" | ||||||
|  | @ -75,14 +60,6 @@ install: | ||||||
|       .travis/install.sh; |       .travis/install.sh; | ||||||
|     fi |     fi | ||||||
| 
 | 
 | ||||||
| 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 |  | ||||||
|     export DISPLAY=:99.0 |  | ||||||
|     sh -e /etc/init.d/xvfb start |  | ||||||
|   fi |  | ||||||
| 
 |  | ||||||
| script: | script: | ||||||
| - | | - | | ||||||
|   if [ "$LINT" == "true" ]; then |   if [ "$LINT" == "true" ]; then | ||||||
|  |  | ||||||
|  | @ -113,12 +113,7 @@ class TestNumpy(PillowTestCase): | ||||||
|         img = Image.fromarray(arr * 255).convert('1') |         img = Image.fromarray(arr * 255).convert('1') | ||||||
|         self.assertEqual(img.mode, '1') |         self.assertEqual(img.mode, '1') | ||||||
|         arr_back = numpy.array(img) |         arr_back = numpy.array(img) | ||||||
|         # numpy 1.8 and earlier return this as a boolean. (trusty/precise) |         numpy.testing.assert_array_equal(arr, arr_back) | ||||||
|         if arr_back.dtype == numpy.bool: |  | ||||||
|             arr_bool = numpy.array([[1, 0, 0, 1, 0], [0, 1, 0, 0, 0]], numpy.bool) |  | ||||||
|             numpy.testing.assert_array_equal(arr_bool, arr_back) |  | ||||||
|         else: |  | ||||||
|             numpy.testing.assert_array_equal(arr, arr_back) |  | ||||||
| 
 | 
 | ||||||
|     def test_save_tiff_uint16(self): |     def test_save_tiff_uint16(self): | ||||||
|         # Tests that we're getting the pixel value in the right byte order. |         # Tests that we're getting the pixel value in the right byte order. | ||||||
|  |  | ||||||
|  | @ -21,11 +21,6 @@ jobs: | ||||||
|     docker: 'arch' |     docker: 'arch' | ||||||
|     name:   '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 | - template: .azure-pipelines/jobs/test-docker.yml | ||||||
|   parameters: |   parameters: | ||||||
|     docker: 'ubuntu-xenial-amd64' |     docker: 'ubuntu-xenial-amd64' | ||||||
|  |  | ||||||
|  | @ -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 has been tested with openjpeg **2.0.0** and **2.1.0**. | ||||||
|   * Pillow does **not** support the earlier **1.5** series which ships |   * 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 | * **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                 | | | Ubuntu Linux 16.04 LTS           | 2.7, 3.5, 3.6, 3.7,           |x86-64                 | | ||||||
| |                                  | PyPy, PyPy3                   |                       | | |                                  | 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            | | | Windows Server 2012 R2           | 2.7, 3.5, 3.6, 3.7            |x86, x86-64            | | ||||||
| |                                  +-------------------------------+-----------------------+ | |                                  +-------------------------------+-----------------------+ | ||||||
| |                                  | PyPy, 3.7/MinGW               |x86                    | | |                                  | PyPy, 3.7/MinGW               |x86                    | | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user