From d40315c7d87a88a2dd9f9e33ebeee5ebb4175859 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 4 Sep 2024 11:19:59 -0400 Subject: [PATCH] cherry-pick changelog from 2.0.34 --- doc/build/changelog/changelog_20.rst | 22 ++++++++++++++++++++- doc/build/changelog/unreleased_20/11831.rst | 9 --------- doc/build/changelog/unreleased_20/11832.rst | 9 --------- 3 files changed, 21 insertions(+), 19 deletions(-) delete mode 100644 doc/build/changelog/unreleased_20/11831.rst delete mode 100644 doc/build/changelog/unreleased_20/11832.rst diff --git a/doc/build/changelog/changelog_20.rst b/doc/build/changelog/changelog_20.rst index 2a432cd0db..1117f0abea 100644 --- 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 index 65699bf5d8..0000000000 --- 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 index 9c1a79df18..0000000000 --- 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. - -- 2.47.2