cherry-pick changelog from 2.0.34

diff --git a/doc/build/changelog/changelog_20.rst b/doc/build/changelog/changelog_20.rst
index 2a432cd0dba1146506aba984a0e8bb92d3514592..1117f0abea326ed689390f128936bf75ebd8a049 100644 (file)
--- a/doc/build/changelog/changelog_20.rst
+++ b/doc/build/changelog/changelog_20.rst
@@ -10,7 +10,27 @@
 
 .. changelog::
     :version: 2.0.34
-    :include_notes_from: unreleased_20
+    :released: September 4, 2024
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 11831
+
+        Fixed regression caused by issue :ticket:`11814` which broke support for
+        certain flavors of :pep:`593` ``Annotated`` in the type_annotation_map when
+        builtin types such as ``list``, ``dict`` were used without an element type.
+        While this is an incomplete style of typing, these types nonetheless
+        previously would be located in the type_annotation_map correctly.
+
+    .. change::
+        :tags: bug, sqlite
+        :tickets: 11832
+
+        Fixed regression in SQLite reflection caused by :ticket:`11677` which
+        interfered with reflection for CHECK constraints that were followed
+        by other kinds of constraints within the same table definition.   Pull
+        request courtesy Harutaka Kawamura.
+
 
 .. changelog::
     :version: 2.0.33

diff --git a/doc/build/changelog/unreleased_20/11831.rst b/doc/build/changelog/unreleased_20/11831.rst
deleted file mode 100644 (file)
index 65699bf..0000000
--- a/doc/build/changelog/unreleased_20/11831.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 11831
-
-    Fixed regression caused by issue :ticket:`11814` which broke support for
-    certain flavors of :pep:`593` ``Annotated`` in the type_annotation_map when
-    builtin types such as ``list``, ``dict`` were used without an element type.
-    While this is an incomplete style of typing, these types nonetheless
-    previously would be located in the type_annotation_map correctly.

diff --git a/doc/build/changelog/unreleased_20/11832.rst b/doc/build/changelog/unreleased_20/11832.rst
deleted file mode 100644 (file)
index 9c1a79d..0000000
--- a/doc/build/changelog/unreleased_20/11832.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: bug, sqlite
-    :tickets: 11832
-
-    Fixed regression in SQLite reflection caused by :ticket:`11677` which
-    interfered with reflection for CHECK constraints that were followed
-    by other kinds of constraints within the same table definition.   Pull
-    request courtesy Harutaka Kawamura.
-