Merge pull request #4141 from hugovk/add-3.8

Add support for Python 3.8
python-pillow · Oct 20, 2019 · a56b971 · a56b971
2 parents 2b86210 + 062c401
commit a56b971
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 25 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -13,6 +13,7 @@ environment:
   TEST_OPTIONS:
   DEPLOY: YES
   matrix:
+  - PYTHON: C:\Python38rc1-x64
   - PYTHON: C:/Python37
   - PYTHON: C:/Python37-x64
   - PYTHON: C:/Python36
@@ -28,7 +29,6 @@ environment:
     EXECUTABLE: bin/pypy.exe
     PIP_DIR: bin
     VENV: YES
-  - PYTHON: C:\Python38rc1-x64
 
 
 install:

diff --git a/.travis.yml b/.travis.yml
@@ -18,6 +18,9 @@ matrix:
       env: LINT="true"
     - python: "pypy3"
       name: "PyPy3 Xenial"
+    - python: "3.8"
+      name: "3.8 Xenial"
+      services: xvfb
     - python: '3.7'
       name: "3.7 Xenial"
       services: xvfb
@@ -29,9 +32,6 @@ matrix:
       name: "3.5 Xenial PYTHONOPTIMIZE=2"
       env: PYTHONOPTIMIZE=2
       services: xvfb
-    - python: "3.8-dev"
-      name: "3.8-dev Xenial"
-      services: xvfb
     - env: DOCKER="alpine" DOCKER_TAG="master"
     - env: DOCKER="arch" DOCKER_TAG="master" # contains PyQt5
     - env: DOCKER="ubuntu-16.04-xenial-amd64" DOCKER_TAG="master"

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -15,23 +15,25 @@ Notes
 
 .. note:: Pillow is supported on the following Python versions
 
-+---------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-|**Python**           |**2.4**|**2.5**|**2.6**|**2.7**|**3.2**|**3.3**|**3.4**|**3.5**|**3.6**|**3.7**|
-+---------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-|Pillow < 2.0.0       |  Yes  |  Yes  |  Yes  |  Yes  |       |       |       |       |       |       |
-+---------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-|Pillow 2.x - 3.x     |       |       |  Yes  |  Yes  |  Yes  |  Yes  |  Yes  |  Yes  |       |       |
-+---------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-|Pillow 4.x           |       |       |       |  Yes  |       |  Yes  |  Yes  |  Yes  |  Yes  |       |
-+---------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-|Pillow 5.0.x - 5.1.x |       |       |       |  Yes  |       |       |  Yes  |  Yes  |  Yes  |       |
-+---------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-|Pillow 5.2.x - 5.4.x |       |       |       |  Yes  |       |       |  Yes  |  Yes  |  Yes  |  Yes  |
-+---------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-|Pillow 6.x           |       |       |       |  Yes  |       |       |       |  Yes  |  Yes  |  Yes  |
-+---------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-|Pillow >= 7.0.0      |       |       |       |       |       |       |       |  Yes  |  Yes  |  Yes  |
-+---------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
++-------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+|**Python**         |**2.4**|**2.5**|**2.6**|**2.7**|**3.2**|**3.3**|**3.4**|**3.5**|**3.6**|**3.7**|**3.8**|
++-------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+|Pillow < 2         |  Yes  |  Yes  |  Yes  |  Yes  |       |       |       |       |       |       |       |
++-------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+|Pillow 2 - 3       |       |       |  Yes  |  Yes  |  Yes  |  Yes  |  Yes  |  Yes  |       |       |       |
++-------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+|Pillow 4           |       |       |       |  Yes  |       |  Yes  |  Yes  |  Yes  |  Yes  |       |       |
++-------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+|Pillow 5.0 - 5.1   |       |       |       |  Yes  |       |       |  Yes  |  Yes  |  Yes  |       |       |
++-------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+|Pillow 5.2 - 5.4   |       |       |       |  Yes  |       |       |  Yes  |  Yes  |  Yes  |  Yes  |       |
++-------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+|Pillow 6.0 - 6.2.0 |       |       |       |  Yes  |       |       |       |  Yes  |  Yes  |  Yes  |       |
++-------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+|Pillow 6.2.1       |       |       |       |  Yes  |       |       |       |  Yes  |  Yes  |  Yes  |  Yes  |
++-------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+|Pillow >= 7        |       |       |       |       |       |       |       |  Yes  |  Yes  |  Yes  |  Yes  |
++-------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
 
 Basic Installation
 ------------------
@@ -405,10 +407,10 @@ These platforms are built and tested for every change.
 +----------------------------------+-------------------------------+-----------------------+
 | macOS 10.13 High Sierra*         | 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                 |
+| Ubuntu Linux 16.04 LTS           | 2.7, 3.5, 3.6, 3.7, 3.8,      |x86-64                 |
 |                                  | PyPy, PyPy3                   |                       |
 +----------------------------------+-------------------------------+-----------------------+
-| 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, 3.8       |x86, x86-64            |
 |                                  +-------------------------------+-----------------------+
 |                                  | PyPy, 3.7/MinGW               |x86                    |
 +----------------------------------+-------------------------------+-----------------------+

diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
 # comment this out to disable multi threaded builds.
 import mp_compile
 
-if sys.platform == "win32" and sys.version_info >= (3, 8):
+if sys.platform == "win32" and sys.version_info >= (3, 9):
     warnings.warn(
         "Pillow does not yet support Python {}.{} and does not yet provide "
         "prebuilt Windows binaries. We do not recommend building from "
@@ -867,6 +867,7 @@ def debug_build():
             "Programming Language :: Python :: 3.5",
             "Programming Language :: Python :: 3.6",
             "Programming Language :: Python :: 3.7",
+            "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: Implementation :: CPython",
             "Programming Language :: Python :: Implementation :: PyPy",
             "Topic :: Multimedia :: Graphics",

diff --git a/tox.ini b/tox.ini
@@ -6,7 +6,7 @@
 [tox]
 envlist =
     lint
-    py{27,35,36,37,py3}
+    py{27,35,36,37,38,py3}
 minversion = 1.9
 
 [testenv]