Merge pull request #3682 from hugovk/deprecate-python2.7

Document Python 2.7 will be dropped on 2020-01-01
python-pillow · Mar 3, 2019 · 6b91f8c · 6b91f8c
2 parents 571aca6 + f77bb0a
commit 6b91f8c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 15 deletions.
diff --git a/docs/deprecations.rst b/docs/deprecations.rst
@@ -12,6 +12,16 @@ Deprecated features
 Below are features which are considered deprecated. Where appropriate,
 a ``DeprecationWarning`` is issued.
 
+Python 2.7
+~~~~~~~~~~
+
+.. deprecated:: 6.0.0
+
+Python 2.7 reaches end-of-life on 2020-01-01.
+
+Pillow 7.0.0 will be released on 2020-01-01 and will drop support for Python 2.7, making
+Pillow 6.x the last series to support Python 2.
+
 PyQt4 and PySide
 ~~~~~~~~~~~~~~~~
 

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -15,21 +15,23 @@ 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.0.0     |       |       |       |  Yes  |       |       |       |  Yes  |  Yes  |  Yes  |
-+--------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
++---------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+|**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  |
++---------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
 
 Basic Installation
 ------------------

diff --git a/docs/releasenotes/6.0.0.rst b/docs/releasenotes/6.0.0.rst
@@ -38,6 +38,14 @@ API Changes
 Deprecations
 ^^^^^^^^^^^^
 
+Python 2.7
+~~~~~~~~~~
+
+Python 2.7 reaches end-of-life on 2020-01-01.
+
+Pillow 7.0.0 will be released on 2020-01-01 and will drop support for Python 2.7, making
+Pillow 6.x the last series to support Python 2.
+
 PyQt4 and PySide
 ~~~~~~~~~~~~~~~~