- 1.4.15

diff --git a/doc/build/changelog/changelog_14.rst b/doc/build/changelog/changelog_14.rst
index a236a3551bb6c3bcd69828ca316efc6bec5868b5..fd6f3c49764d7253971289d4742314d4a3c3e3c4 100644 (file)
--- a/doc/build/changelog/changelog_14.rst
+++ b/doc/build/changelog/changelog_14.rst
@@ -15,7 +15,59 @@ This document details individual issue-level changes made throughout
 
 .. changelog::
     :version: 1.4.15
-    :include_notes_from: unreleased_14
+    :released: May 11, 2021
+
+    .. change::
+        :tags: bug, documentation, mysql
+        :tickets: 5397
+
+        Added support for the ``ssl_check_hostname=`` parameter in mysql connection
+        URIs and updated the mysql dialect documentation regarding secure
+        connections. Original pull request courtesy of Jerry Zhao.
+
+    .. change::
+        :tags: bug, orm, regression
+        :tickets: 6449
+
+        Fixed additional regression caused by "eager loaders run on unexpire"
+        feature :ticket:`1763` where the feature would run for a
+        ``contains_eager()`` eagerload option in the case that the
+        ``contains_eager()`` were chained to an additional eager loader option,
+        which would then produce an incorrect query as the original query-bound
+        join criteria were no longer present.
+
+    .. change::
+        :tags: feature, general
+        :tickets: 6241
+
+        A new approach has been applied to the warnings system in SQLAlchemy to
+        accurately predict the appropriate stack level for each warning
+        dynamically. This allows evaluating the source of SQLAlchemy-generated
+        warnings and deprecation warnings to be more straightforward as the warning
+        will indicate the source line within end-user code, rather than from an
+        arbitrary level within SQLAlchemy's own source code.
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 6459
+
+        Fixed issue in subquery loader strategy which prevented caching from
+        working correctly. This would have been seen in the logs as a "generated"
+        message instead of "cached" for all subqueryload SQL emitted, which by
+        saturating the cache with new keys would degrade overall performance; it
+        also would produce "LRU size alert" warnings.
+
+
+    .. change::
+        :tags: bug, sql
+        :tickets: 6460
+
+        Adjusted the logic added as part of :ticket:`6397` in 1.4.12 so that
+        internal mutation of the :class:`.BindParameter` object occurs within the
+        clause construction phase as it did before, rather than in the compilation
+        phase. In the latter case, the mutation still produced side effects against
+        the incoming construct and additionally could potentially interfere with
+        other internal mutation routines.
 
 .. changelog::
     :version: 1.4.14

diff --git a/doc/build/changelog/unreleased_14/5397.rst b/doc/build/changelog/unreleased_14/5397.rst
deleted file mode 100644 (file)
index ca6dcf9..0000000
--- a/doc/build/changelog/unreleased_14/5397.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. change::
-    :tags: bug, documentation, mysql
-    :tickets: 5397
-
-    Added support for the ``ssl_check_hostname=`` parameter in mysql connection
-    URIs and updated the mysql dialect documentation regarding secure
-    connections. Original pull request courtesy of Jerry Zhao.

diff --git a/doc/build/changelog/unreleased_14/6241.rst b/doc/build/changelog/unreleased_14/6241.rst
deleted file mode 100644 (file)
index a30816b..0000000
--- a/doc/build/changelog/unreleased_14/6241.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: feature, general
-    :tickets: 6241
-
-    A new approach has been applied to the warnings system in SQLAlchemy to
-    accurately predict the appropriate stack level for each warning
-    dynamically. This allows evaluating the source of SQLAlchemy-generated
-    warnings and deprecation warnings to be more straightforward as the warning
-    will indicate the source line within end-user code, rather than from an
-    arbitrary level within SQLAlchemy's own source code.

diff --git a/doc/build/changelog/unreleased_14/6449.rst b/doc/build/changelog/unreleased_14/6449.rst
deleted file mode 100644 (file)
index 56dd781..0000000
--- a/doc/build/changelog/unreleased_14/6449.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: bug, orm, regression
-    :tickets: 6449
-
-    Fixed additional regression caused by "eager loaders run on unexpire"
-    feature :ticket:`1763` where the feature would run for a
-    ``contains_eager()`` eagerload option in the case that the
-    ``contains_eager()`` were chained to an additional eager loader option,
-    which would then produce an incorrect query as the original query-bound
-    join criteria were no longer present.

diff --git a/doc/build/changelog/unreleased_14/6459.rst b/doc/build/changelog/unreleased_14/6459.rst
deleted file mode 100644 (file)
index dd5e84a..0000000
--- a/doc/build/changelog/unreleased_14/6459.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 6459
-
-    Fixed issue in subquery loader strategy which prevented caching from
-    working correctly. This would have been seen in the logs as a "generated"
-    message instead of "cached" for all subqueryload SQL emitted, which by
-    saturating the cache with new keys would degrade overall performance; it
-    also would produce "LRU size alert" warnings.
-

diff --git a/doc/build/changelog/unreleased_14/6460.rst b/doc/build/changelog/unreleased_14/6460.rst
deleted file mode 100644 (file)
index faeecd4..0000000
--- a/doc/build/changelog/unreleased_14/6460.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: bug, sql
-    :tickets: 6460
-
-    Adjusted the logic added as part of :ticket:`6397` in 1.4.12 so that
-    internal mutation of the :class:`.BindParameter` object occurs within the
-    clause construction phase as it did before, rather than in the compilation
-    phase. In the latter case, the mutation still produced side effects against
-    the incoming construct and additionally could potentially interfere with
-    other internal mutation routines.

diff --git a/doc/build/conf.py b/doc/build/conf.py
index 12402b435786085686580fc120a28e9a6a7376a5..87b1baa764908b2142d9d526f046ad7f75cec351 100644 (file)
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -195,9 +195,9 @@ copyright = u"2007-2021, the SQLAlchemy authors and contributors"  # noqa
 # The short X.Y version.
 version = "1.4"
 # The full version, including alpha/beta/rc tags.
-release = "1.4.14"
+release = "1.4.15"
 
-release_date = "May 6, 2021"
+release_date = "May 11, 2021"
 
 site_base = os.environ.get("RTD_SITE_BASE", "http://www.sqlalchemy.org")
 site_adapter_template = "docs_adapter.mako"