- 1.2.5

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index de58e730e1fa4b21cf626656966ef45aea604d65..c85380bbf8d98146a3924e5dee653e26657daee5 100644 (file)
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -12,7 +12,64 @@
 
 .. changelog::
     :version: 1.2.5
-    :include_notes_from: unreleased_12
+    :released: March 6, 2018
+
+    .. change::
+        :tags: bug, sql
+        :tickets: 4210
+        :versions: 1.3.0b1
+
+        Fixed bug in :class:.`CTE` construct along the same lines as that of
+        :ticket:`4204` where a :class:`.CTE` that was aliased would not copy itself
+        correctly during a "clone" operation as is frequent within the ORM as well
+        as when using the :meth:`.ClauseElement.params` method.
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4199
+
+        Fixed bug in new "polymorphic selectin" loading when a selection of
+        polymorphic objects were to be partially loaded from a relationship
+        lazy loader, leading to an "empty IN" condition within the load that
+        raises an error for the "inline" form of "IN".
+
+    .. change::
+        :tags: bug, sql
+        :tickets: 4204
+
+        Fixed bug in CTE rendering where a :class:`.CTE` that was also turned into
+        an :class:`.Alias` would not render its "ctename AS aliasname" clause
+        appropriately if there were more than one reference to the CTE in a FROM
+        clause.
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4209
+        :versions: 1.3.0b1
+
+        Fixed 1.2 regression where a mapper option that contains an
+        :class:`.AliasedClass` object, as is typical when using the
+        :meth:`.QueryableAttribute.of_type` method, could not be pickled.   1.1's
+        behavior was to omit the aliased class objects from the path, so this
+        behavior is restored.
+
+    .. change::
+        :tags: feature, orm
+        :versions: 1.3.0b1
+
+        Added new feature :meth:`.Query.only_return_tuples`.  Causes the
+        :class:`.Query` object to return keyed tuple objects unconditionally even
+        if the query is against a single entity.   Pull request courtesy Eric
+        Atkin.
+
+
+    .. change::
+        :tags: bug, sql
+        :tickets: 4198
+
+        Fixed bug in new "expanding IN parameter" feature where the bind parameter
+        processors for values wasn't working at all, tests failed to cover this
+        pretty basic case which includes that ENUM values weren't working.
 
 .. changelog::
     :version: 1.2.4

diff --git a/doc/build/changelog/unreleased_12/4198.rst b/doc/build/changelog/unreleased_12/4198.rst
deleted file mode 100644 (file)
index e5cc3cf..0000000
--- a/doc/build/changelog/unreleased_12/4198.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. change::
-    :tags: bug, sql
-    :tickets: 4198
-
-    Fixed bug in new "expanding IN parameter" feature where the bind parameter
-    processors for values wasn't working at all, tests failed to cover this
-    pretty basic case which includes that ENUM values weren't working.

diff --git a/doc/build/changelog/unreleased_12/4199.rst b/doc/build/changelog/unreleased_12/4199.rst
deleted file mode 100644 (file)
index 2852839..0000000
--- a/doc/build/changelog/unreleased_12/4199.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4199
-
-    Fixed bug in new "polymorphic selectin" loading when a selection of
-    polymorphic objects were to be partially loaded from a relationship
-    lazy loader, leading to an "empty IN" condition within the load that
-    raises an error for the "inline" form of "IN".

diff --git a/doc/build/changelog/unreleased_12/4204.rst b/doc/build/changelog/unreleased_12/4204.rst
deleted file mode 100644 (file)
index 424a025..0000000
--- a/doc/build/changelog/unreleased_12/4204.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-    :tags: bug, sql
-    :tickets: 4204
-
-    Fixed bug in CTE rendering where a :class:`.CTE` that was also turned into
-    an :class:`.Alias` would not render its "ctename AS aliasname" clause
-    appropriately if there were more than one reference to the CTE in a FROM
-    clause.

diff --git a/doc/build/changelog/unreleased_12/4209.rst b/doc/build/changelog/unreleased_12/4209.rst
deleted file mode 100644 (file)
index f61e90e..0000000
--- a/doc/build/changelog/unreleased_12/4209.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4209
-    :versions: 1.3.0b1
-
-    Fixed 1.2 regression where a mapper option that contains an
-    :class:`.AliasedClass` object, as is typical when using the
-    :meth:`.QueryableAttribute.of_type` method, could not be pickled.   1.1's
-    behavior was to omit the aliased class objects from the path, so this
-    behavior is restored.

diff --git a/doc/build/changelog/unreleased_12/4210.rst b/doc/build/changelog/unreleased_12/4210.rst
deleted file mode 100644 (file)
index 04e7e86..0000000
--- a/doc/build/changelog/unreleased_12/4210.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: bug, sql
-    :tickets: 4210
-    :versions: 1.3.0b1
-
-    Fixed bug in :class:.`CTE` construct along the same lines as that of
-    :ticket:`4204` where a :class:`.CTE` that was aliased would not copy itself
-    correctly during a "clone" operation as is frequent within the ORM as well
-    as when using the :meth:`.ClauseElement.params` method.

diff --git a/doc/build/changelog/unreleased_12/single_entity.rst b/doc/build/changelog/unreleased_12/single_entity.rst
deleted file mode 100644 (file)
index 3eb7e56..0000000
--- a/doc/build/changelog/unreleased_12/single_entity.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: feature, orm
-    :versions: 1.3.0b1
-
-    Added new feature :meth:`.Query.only_return_tuples`.  Causes the
-    :class:`.Query` object to return keyed tuple objects unconditionally even
-    if the query is against a single entity.   Pull request courtesy Eric
-    Atkin.
-

diff --git a/doc/build/conf.py b/doc/build/conf.py
index 33b70dff6ba7ec764fb9abe4c1dc74790ce8b192..89527fd468b4544d65e5a0cea4e055b88c7463ab 100644 (file)
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -110,9 +110,9 @@ copyright = u'2007-2018, the SQLAlchemy authors and contributors'
 # The short X.Y version.
 version = "1.2"
 # The full version, including alpha/beta/rc tags.
-release = "1.2.4"
+release = "1.2.5"
 
-release_date = "February 22, 2018"
+release_date = "March 6, 2018"
 
 site_base = os.environ.get("RTD_SITE_BASE", "http://www.sqlalchemy.org")
 site_adapter_template = "docs_adapter.mako"