- 1.2.0

10 files changed, 53 insertions, 45 deletions

diff --git a/doc/build/changelog.rst b/doc/build/changelog.rst
index 6034227..93aa7ec 100644
--- a/doc/build/changelog.rst
+++ b/doc/build/changelog.rst
@@ -8,7 +8,57 @@ Changelog
 
 .. changelog::
     :version: 1.2.0
-    :include_notes_from: unreleased
+    :released: Tue Jan 18 2022
+
+    .. change::
+        :tags: changed, py3k
+        :tickets: 351
+
+        Corrected "universal wheel" directive in ``setup.cfg`` so that building a
+        wheel does not target Python 2.
+
+    .. change::
+        :tags: changed, py3k
+
+        The ``bytestring_passthrough`` template argument is removed, as this
+        flag only applied to Python 2.
+
+    .. change::
+        :tags: changed, py3k
+
+        With the removal of Python 2's ``cStringIO``, Mako now uses its own
+        internal ``FastEncodingBuffer`` exclusively.
+
+    .. change::
+        :tags: changed, py3k
+
+        Removed ``disable_unicode`` flag, that's no longer used in Python 3.
+
+    .. change::
+        :tags: changed
+        :tickets: 349
+
+        Refactored test utilities into ``mako.testing`` module. Removed
+        ``unittest.TestCase`` dependency in favor of ``pytest``.
+
+    .. change::
+        :tags: changed, setup
+
+        Replaced the use of ``pkg_resources`` with the ``importlib`` library.
+        For Python < 3.8 the library ``importlib_metadata`` is used.
+
+    .. change::
+        :tags: changed, py3k
+
+        Removed support for Python 2 and Python 3.6. Mako now requires Python >=
+        3.7.
+
+    .. change::
+        :tags: bug, py3k
+
+        Mako now performs exception chaining using ``raise from``, correctly
+        identifying underlying exception conditions when it raises its own
+        exceptions. Pull request courtesy Ram Rachum.
 
 1.1
 ===
diff --git a/doc/build/conf.py b/doc/build/conf.py
index 49a8fe9..774103d 100644
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -87,8 +87,8 @@ copyright = "the Mako authors and contributors"
 # The short X.Y version.
 version = mako.__version__
 # The full version, including alpha/beta/rc tags.
-release = "1.1.5"
-release_date = None
+release = "1.2.0"
+release_date = "Tue Jan 18 2022"
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 # language = None
diff --git a/doc/build/unreleased/351.rst b/doc/build/unreleased/351.rst
deleted file mode 100644
index 2640464..0000000
--- a/doc/build/unreleased/351.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-.. change::
-    :tags: changed, py3k
-    :tickets: 351
-
-    Corrected "universal wheel" directive in ``setup.cfg`` so that building a
-    wheel does not target Python 2.
diff --git a/doc/build/unreleased/bytestring_passthrough.rst b/doc/build/unreleased/bytestring_passthrough.rst
deleted file mode 100644
index d9e916e..0000000
--- a/doc/build/unreleased/bytestring_passthrough.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. change::
-    :tags: changed, py3k
-
-    The ``bytestring_passthrough`` template argument is removed, as this
-    flag only applied to Python 2.
diff --git a/doc/build/unreleased/cstring_io.rst b/doc/build/unreleased/cstring_io.rst
deleted file mode 100644
index b209523..0000000
--- a/doc/build/unreleased/cstring_io.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. change::
-    :tags: changed, py3k
-
-    With the removal of Python 2's ``cStringIO``, Mako now uses its own
-    internal ``FastEncodingBuffer`` exclusively.
diff --git a/doc/build/unreleased/disable_unicode.rst b/doc/build/unreleased/disable_unicode.rst
deleted file mode 100644
index 87dead9..0000000
--- a/doc/build/unreleased/disable_unicode.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-.. change::
-    :tags: changed, py3k
-
-    Removed ``disable_unicode`` flag, that's no longer used in Python 3.
diff --git a/doc/build/unreleased/mako_testing.rst b/doc/build/unreleased/mako_testing.rst
deleted file mode 100644
index 13c51c8..0000000
--- a/doc/build/unreleased/mako_testing.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-.. change::
-    :tags: changed
-    :tickets: 349
-
-    Refactored test utilities into ``mako.testing`` module. Removed
-    ``unittest.TestCase`` dependency in favor of ``pytest``.
diff --git a/doc/build/unreleased/pgk_resources.rst b/doc/build/unreleased/pgk_resources.rst
deleted file mode 100644
index 21785ac..0000000
--- a/doc/build/unreleased/pgk_resources.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. change::
-    :tags: changed, setup
-
-    Replaced the use of ``pkg_resources`` with the ``importlib`` library.
-    For Python < 3.8 the library ``importlib_metadata`` is used.
diff --git a/doc/build/unreleased/py2.rst b/doc/build/unreleased/py2.rst
deleted file mode 100644
index d476f29..0000000
--- a/doc/build/unreleased/py2.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. change::
-    :tags: changed, py3k
-
-    Removed support for Python 2 and Python 3.6. Mako now requires Python >=
-    3.7.
diff --git a/doc/build/unreleased/raise_from.rst b/doc/build/unreleased/raise_from.rst
deleted file mode 100644
index bec705d..0000000
--- a/doc/build/unreleased/raise_from.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-.. change::
-    :tags: bug, py3k
-
-    Mako now performs exception chaining using ``raise from``, correctly
-    identifying underlying exception conditions when it raises its own
-    exceptions. Pull request courtesy Ram Rachum.