From c9c02c513b841e63c6947528881fb5deab8a1869 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Fri, 1 Nov 2019 13:42:12 +0200
Subject: [PATCH] Update docs for 7.0.0

---
 docs/deprecations.rst       | 46 ++++++++++++------------
 docs/releasenotes/7.0.0.rst | 71 +++++++++++++++++++++++++++++++++++++
 docs/releasenotes/index.rst |  1 +
 3 files changed, 95 insertions(+), 23 deletions(-)
 create mode 100644 docs/releasenotes/7.0.0.rst

diff --git a/docs/deprecations.rst b/docs/deprecations.rst
index 396300f1f..3a48f37ee 100644
--- a/docs/deprecations.rst
+++ b/docs/deprecations.rst
@@ -12,29 +12,6 @@ Deprecated features
 Below are features which are considered deprecated. Where appropriate,
 a ``DeprecationWarning`` is issued.
 
-Image.__del__
-~~~~~~~~~~~~~
-
-.. deprecated:: 6.1.0
-
-Implicitly closing the image's underlying file in ``Image.__del__`` has been deprecated.
-Use a context manager or call ``Image.close()`` instead to close the file in a
-deterministic way.
-
-Deprecated:
-
-.. code-block:: python
-
-    im = Image.open("hopper.png")
-    im.save("out.jpg")
-
-Use instead:
-
-.. code-block:: python
-
-    with Image.open("hopper.png") as im:
-        im.save("out.jpg")
-
 Python 2.7
 ~~~~~~~~~~
 
@@ -96,6 +73,29 @@ Removed features
 Deprecated features are only removed in major releases after an appropriate
 period of deprecation has passed.
 
+Image.__del__
+~~~~~~~~~~~~~
+
+*Removed in version 7.0.0.*
+
+Implicitly closing the image's underlying file in ``Image.__del__`` has been removed.
+Use a context manager or call ``Image.close()`` instead to close the file in a
+deterministic way.
+
+Deprecated:
+
+.. code-block:: python
+
+    im = Image.open("hopper.png")
+    im.save("out.jpg")
+
+Use instead:
+
+.. code-block:: python
+
+    with Image.open("hopper.png") as im:
+        im.save("out.jpg")
+
 PILLOW_VERSION constant
 ~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/releasenotes/7.0.0.rst b/docs/releasenotes/7.0.0.rst
new file mode 100644
index 000000000..4fb6773c4
--- /dev/null
+++ b/docs/releasenotes/7.0.0.rst
@@ -0,0 +1,71 @@
+7.0.0
+-----
+
+Backwards Incompatible Changes
+==============================
+
+PILLOW_VERSION constant
+^^^^^^^^^^^^^^^^^^^^^^^
+
+``PILLOW_VERSION`` has been removed. Use ``__version__`` instead.
+
+PyQt4 and PySide
+^^^^^^^^^^^^^^^^
+
+Qt 4 reached end-of-life on 2015-12-19. Its Python bindings are also EOL: PyQt4 since
+2018-08-31 and PySide since 2015-10-14.
+
+Support for PyQt4 and PySide has been removed  from ``ImageQt``. Please upgrade to PyQt5
+or PySide2.
+
+Setting the size of TIFF images
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Setting the size of a TIFF image directly (eg. ``im.size = (256, 256)``) throws
+an error. Use ``Image.resize`` instead.
+
+
+API Changes
+===========
+
+Deprecations
+^^^^^^^^^^^^
+
+TODO
+~~~~
+
+TODO
+
+
+API Additions
+=============
+
+TODO
+^^^^
+
+TODO
+
+
+Other Changes
+=============
+
+Image.__del__
+^^^^^^^^^^^^^
+
+Implicitly closing the image's underlying file in ``Image.__del__`` has been removed.
+Use a context manager or call ``Image.close()`` instead to close the file in a
+deterministic way.
+
+Deprecated:
+
+.. code-block:: python
+
+    im = Image.open("hopper.png")
+    im.save("out.jpg")
+
+Use instead:
+
+.. code-block:: python
+
+    with Image.open("hopper.png") as im:
+        im.save("out.jpg")
diff --git a/docs/releasenotes/index.rst b/docs/releasenotes/index.rst
index 381643cf3..6f8ecb95c 100644
--- a/docs/releasenotes/index.rst
+++ b/docs/releasenotes/index.rst
@@ -6,6 +6,7 @@ Release Notes
 .. toctree::
   :maxdepth: 2
 
+  7.0.0
   6.2.1
   6.2.0
   6.1.0