From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 21 Jan 2022 01:33:00 +0000 (-0500)
Subject: more corrections to 1.4.31 release
X-Git-Tag: rel_2_0_0b1~453
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=849a21f5b6be2efd9d8bc956a4aa6a093827a468;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

more corrections to 1.4.31 release

(cherry picked from commit ab42b0e3d98386c8a13edea3206ef43f018de3b6)

Change-Id: I66414da6689d1f7fdd52056176ba9b04a415e532
---

diff --git a/doc/build/changelog/changelog_14.rst b/doc/build/changelog/changelog_14.rst
index 085b21f2e6..389ef68b2d 100644
--- a/doc/build/changelog/changelog_14.rst
+++ b/doc/build/changelog/changelog_14.rst
@@ -19,7 +19,45 @@ This document details individual issue-level changes made throughout
 
 .. changelog::
     :version: 1.4.31
-    :include_notes_from: unreleased_14
+    :released: January 20, 2022
+
+    .. change::
+        :tags: bug, postgresql, regression
+        :tickets: 7590
+
+        Fixed regression where the change in :ticket:`7148` to repair ENUM handling
+        in PostgreSQL broke the use case of an empty ARRAY of ENUM, preventing rows
+        that contained an empty array from being handled correctly when fetching
+        results.
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 7591
+
+        Fixed issue in :meth:`_orm.Session.bulk_save_objects` where the sorting
+        that takes place when the ``preserve_order`` parameter is set to False
+        would sort partially on ``Mapper`` objects, which is rejected in Python
+        3.11.
+
+
+    .. change::
+        :tags: bug, mysql, regression
+        :tickets: 7593
+
+        Fixed regression in asyncmy dialect caused by :ticket:`7567` where removal
+        of the PyMySQL dependency broke binary columns, due to the asyncmy dialect
+        not being properly included within CI tests.
+
+    .. change::
+        :tags: mssql
+        :tickets: 7243
+
+        Added support for ``FILESTREAM`` when using ``VARBINARY(max)``
+        in MSSQL.
+
+        .. seealso::
+
+            :paramref:`_mssql.VARBINARY.filestream`
 
 .. changelog::
     :version: 1.4.30
diff --git a/doc/build/changelog/unreleased_14/7243.rst b/doc/build/changelog/unreleased_14/7243.rst
deleted file mode 100644
index b4661c2942..0000000000
--- a/doc/build/changelog/unreleased_14/7243.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: mssql
-    :tickets: 7243
-
-    Added support for ``FILESTREAM`` when using ``VARBINARY(max)``
-    in MSSQL.
-
-    .. seealso::
-
-        :paramref:`_mssql.VARBINARY.filestream`
diff --git a/doc/build/changelog/unreleased_14/7590.rst b/doc/build/changelog/unreleased_14/7590.rst
deleted file mode 100644
index 822adf6dd0..0000000000
--- a/doc/build/changelog/unreleased_14/7590.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-    :tags: bug, postgresql, regression
-    :tickets: 7590
-
-    Fixed regression where the change in :ticket:`7148` to repair ENUM handling
-    in PostgreSQL broke the use case of an empty ARRAY of ENUM, preventing rows
-    that contained an empty array from being handled correctly when fetching
-    results.
diff --git a/doc/build/changelog/unreleased_14/7591.rst b/doc/build/changelog/unreleased_14/7591.rst
deleted file mode 100644
index 5724a059da..0000000000
--- a/doc/build/changelog/unreleased_14/7591.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 7591
-
-    Fixed issue in :meth:`_orm.Session.bulk_save_objects` where the sorting
-    that takes place when the ``preserve_order`` parameter is set to False
-    would sort partially on ``Mapper`` objects, which is rejected in Python
-    3.11.
-
diff --git a/doc/build/changelog/unreleased_14/7593.rst b/doc/build/changelog/unreleased_14/7593.rst
deleted file mode 100644
index ebb3406ed7..0000000000
--- a/doc/build/changelog/unreleased_14/7593.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. change::
-    :tags: bug, mysql, regression
-    :tickets: 7593
-
-    Fixed regression in asyncmy dialect caused by :ticket:`7567` where removal
-    of the PyMySQL dependency broke binary columns, due to the asyncmy dialect
-    not being properly included within CI tests.