Merge pull request python-pillow#4322 from radarhere/python27

Python 2.7 end of support documentation in changelog and deprecations
gvvynplaine · Dec 31, 2019 · fd4bd90 · fd4bd90
2 parents 5223ba2 + 6996bf8
commit fd4bd90
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git 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]
 

diff --git 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__
 ~~~~~~~~~~~~~