From d85ad58cb9477c10e6a8ded224fe880391a45f68 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 31 Dec 2019 23:12:01 +1100 Subject: [PATCH 1/2] Python 2.7 support has been removed [ci skip] --- docs/deprecations.rst | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index a9b534dca..bcabb8186 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -12,16 +12,6 @@ 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. - ImageCms.CmsProfile attributes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -48,6 +38,14 @@ Removed features Deprecated features are only removed in major releases after an appropriate period of deprecation has passed. +Python 2.7 +~~~~~~~~~~ + +*Removed in version 7.0.0.* + +Python 2.7 reached end-of-life on 2020-01-01. Pillow 6.x was the last series to +support Python 2. + Image.__del__ ~~~~~~~~~~~~~ From 6996bf80bf7731c47391eb022061c242c5b297a1 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 31 Dec 2019 23:13:39 +1100 Subject: [PATCH 2/2] Moved Python 2.7 notice to the top [ci skip] --- CHANGES.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index f9d72a6c8..93fd52cc9 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 7.0.0 (unreleased) ------------------ +- Drop support for EOL Python 2.7 #4109 + [hugovk, radarhere, jdufresne] + - Exif writing fixes: Rational boundaries and signed/unsigned types #3980 [kkopachev, radarhere] @@ -47,9 +50,6 @@ Changelog (Pillow) - Fix Unicode support for PyPy #4145 [nulano] -- Drop support for EOL Python 2.7 #4109 - [hugovk, radarhere, jdufresne] - - Added UnidentifiedImageError #4182 [radarhere, hugovk]