- 1.3.15

diff --git a/doc/build/changelog/changelog_13.rst b/doc/build/changelog/changelog_13.rst
index 86ddda16cc883c8e612ebe183f9ec786b61cd309..1b80ad371201f44be8cd2ac9664229a110aa68ac 100644 (file)
--- a/doc/build/changelog/changelog_13.rst
+++ b/doc/build/changelog/changelog_13.rst
@@ -12,7 +12,28 @@
 
 .. changelog::
     :version: 1.3.15
-    :include_notes_from: unreleased_13
+    :released: March 11, 2020
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 5194
+
+        Adjusted the error message emitted by :meth:`.Query.join` when a left hand
+        side can't be located that the :meth:`.Query.select_from` method is the
+        best way to resolve the issue.  Also, within the 1.3 series, used a
+        deterministic ordering when determining the FROM clause from a given column
+        entity passed to :class:`.Query` so that the same expression is determined
+        each time.
+
+
+    .. change::
+        :tags: orm, bug
+        :tickets: 5196
+
+        Fixed regression in 1.3.14 due to :ticket:`4849` where a sys.exc_info()
+        call failed to be invoked correctly when a flush error would occur. Test
+        coverage has been added for this exception case.
+
 
 .. changelog::
     :version: 1.3.14

diff --git a/doc/build/changelog/unreleased_13/5194.rst b/doc/build/changelog/unreleased_13/5194.rst
deleted file mode 100644 (file)
index 7047fb3..0000000
--- a/doc/build/changelog/unreleased_13/5194.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 5194
-
-    Adjusted the error message emitted by :meth:`.Query.join` when a left hand
-    side can't be located that the :meth:`.Query.select_from` method is the
-    best way to resolve the issue.  Also, within the 1.3 series, used a
-    deterministic ordering when determining the FROM clause from a given column
-    entity passed to :class:`.Query` so that the same expression is determined
-    each time.
-

diff --git a/doc/build/changelog/unreleased_13/5196.rst b/doc/build/changelog/unreleased_13/5196.rst
deleted file mode 100644 (file)
index 3183164..0000000
--- a/doc/build/changelog/unreleased_13/5196.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-    :tags: orm, bug
-    :tickets: 5196
-
-    Fixed regression in 1.3.14 due to :ticket:`4849` where a sys.exc_info()
-    call failed to be invoked correctly when a flush error would occur. Test
-    coverage has been added for this exception case.
-

diff --git a/doc/build/conf.py b/doc/build/conf.py
index 487a2a08a313f1898a237ff354b76e649b10b436..d81317a09da7376176c27c517c56a183485b2fd1 100644 (file)
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -123,9 +123,9 @@ copyright = u"2007-2020, the SQLAlchemy authors and contributors"  # noqa
 # The short X.Y version.
 version = "1.3"
 # The full version, including alpha/beta/rc tags.
-release = "1.3.14"
+release = "1.3.15"
 
-release_date = "March 10, 2020"
+release_date = "March 11, 2020"
 
 site_base = os.environ.get("RTD_SITE_BASE", "http://www.sqlalchemy.org")
 site_adapter_template = "docs_adapter.mako"