From 5f1b6bf752452b4f89f71a8a5b4e0c43414a91a0 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 2 Mar 2019 20:18:52 +0200 Subject: [PATCH 1/3] Document Python 2.7 will be dropped on 2020-01-01 --- docs/deprecations.rst | 10 ++++++++++ docs/releasenotes/6.0.0.rst | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index bc4e83161b5..b1dea0ca4ab 100644 --- 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/releasenotes/6.0.0.rst b/docs/releasenotes/6.0.0.rst index 9fbb3d69ac1..a535e6a4cf6 100644 --- a/docs/releasenotes/6.0.0.rst +++ b/docs/releasenotes/6.0.0.rst @@ -32,6 +32,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 ~~~~~~~~~~~~~~~~ From e96e2791cb25ae2a1c73820718b1e4dcddbc2b52 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 2 Mar 2019 20:27:35 +0200 Subject: [PATCH 2/3] Fix RST warning: 'Unknown target name' --- docs/installation.rst | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index abccfcf56e2..8f9b4273f9b 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -15,21 +15,21 @@ 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 | ++---------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ Basic Installation ------------------ From f77bb0a15a601d04c0f74eac3aa20788ffda6b34 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 2 Mar 2019 20:27:54 +0200 Subject: [PATCH 3/3] Document Python 2.7 will be dropped in Pillow 7.x --- docs/installation.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/installation.rst b/docs/installation.rst index 8f9b4273f9b..44cd9af6f33 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -30,6 +30,8 @@ Notes +---------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ |Pillow 6.x | | | | Yes | | | | Yes | Yes | Yes | +---------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ +|Pillow >= 7.0.0 | | | | | | | | Yes | Yes | Yes | ++---------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ Basic Installation ------------------