- 1.2.1

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index 2528d3997b88cc38dccdc75e3bd84964bbe5f86e..fc28591d53a1e0f96151a8b7154dbf1df1f62fc4 100644 (file)
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -12,7 +12,88 @@
 
 .. changelog::
     :version: 1.2.1
-    :include_notes_from: unreleased_12
+    :released: January 15, 2018
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4159
+
+        Fixed regression where pickle format of a Load / _UnboundLoad object (e.g.
+        loader options) changed and ``__setstate__()`` was raising an
+        UnboundLocalError for an object received from the legacy format, even
+        though an attempt was made to do so.  tests are now added to ensure this
+        works.
+
+    .. change::
+        :tags: bug, ext
+        :tickets: 4150
+
+        Fixed regression in association proxy due to :ticket:`3769`
+        (allow for chained any() / has()) where contains() against
+        an association proxy chained in the form
+        (o2m relationship, associationproxy(m2o relationship, m2o relationship))
+        would raise an error regarding the re-application of contains()
+        on the final link of the chain.
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4153
+
+        Fixed regression caused by new lazyload caching scheme in :ticket:`3954`
+        where a query that makes use of loader options with of_type would cause
+        lazy loads of unrelated paths to fail with a TypeError.
+
+    .. change::
+        :tags: bug, oracle
+        :tickets: 4157
+
+        Fixed regression where the removal of most setinputsizes
+        rules from cx_Oracle dialect impacted the TIMESTAMP
+        datatype's ability to retrieve fractional seconds.
+
+
+
+    .. change::
+        :tags: bug, tests
+
+        Removed an oracle-specific requirements rule from the public
+        test suite that was interfering with third party dialect
+        suites.
+
+    .. change::
+        :tags: bug, mssql
+        :tickets: 4154
+
+        Fixed regression in 1.2 where newly repaired quoting
+        of collation names in :ticket:`3785` breaks SQL Server,
+        which explicitly does not understand a quoted collation
+        name.   Whether or not mixed-case collation names are
+        quoted or not is now deferred down to a dialect-level
+        decision so that each dialect can prepare these identifiers
+        directly.
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4156
+
+        Fixed bug in new "selectin" relationship loader where the loader could try
+        to load a non-existent relationship when loading a collection of
+        polymorphic objects, where only some of the mappers include that
+        relationship, typically when :meth:`.PropComparator.of_type` is being used.
+
+    .. change::
+        :tags: bug, tests
+
+        Added a new exclusion rule group_by_complex_expression
+        which disables tests that use "GROUP BY <expr>", which seems
+        to be not viable for at least two third party dialects.
+
+    .. change::
+        :tags: bug, oracle
+
+        Fixed regression in Oracle imports where a missing comma caused
+        an undefined symbol to be present.  Pull request courtesy
+        Miroslav Shubernetskiy.
 
 .. changelog::
     :version: 1.2.0

diff --git a/doc/build/changelog/unreleased_12/4150.rst b/doc/build/changelog/unreleased_12/4150.rst
deleted file mode 100644 (file)
index db3d05b..0000000
--- a/doc/build/changelog/unreleased_12/4150.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: bug, ext
-    :tickets: 4150
-
-    Fixed regression in association proxy due to :ticket:`3769`
-    (allow for chained any() / has()) where contains() against
-    an association proxy chained in the form
-    (o2m relationship, associationproxy(m2o relationship, m2o relationship))
-    would raise an error regarding the re-application of contains()
-    on the final link of the chain.

diff --git a/doc/build/changelog/unreleased_12/4153.rst b/doc/build/changelog/unreleased_12/4153.rst
deleted file mode 100644 (file)
index b3b0936..0000000
--- a/doc/build/changelog/unreleased_12/4153.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4153
-
-    Fixed regression caused by new lazyload caching scheme in :ticket:`3954`
-    where a query that makes use of loader options with of_type would cause
-    lazy loads of unrelated paths to fail with a TypeError.

diff --git a/doc/build/changelog/unreleased_12/4154.rst b/doc/build/changelog/unreleased_12/4154.rst
deleted file mode 100644 (file)
index 523e330..0000000
--- a/doc/build/changelog/unreleased_12/4154.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-.. change::
-    :tags: bug, mssql
-    :tickets: 4154
-
-    Fixed regression in 1.2 where newly repaired quoting
-    of collation names in :ticket:`3785` breaks SQL Server,
-    which explicitly does not understand a quoted collation
-    name.   Whether or not mixed-case collation names are
-    quoted or not is now deferred down to a dialect-level
-    decision so that each dialect can prepare these identifiers
-    directly.

diff --git a/doc/build/changelog/unreleased_12/4156.rst b/doc/build/changelog/unreleased_12/4156.rst
deleted file mode 100644 (file)
index 4511302..0000000
--- a/doc/build/changelog/unreleased_12/4156.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4156
-
-    Fixed bug in new "selectin" relationship loader where the loader could try
-    to load a non-existent relationship when loading a collection of
-    polymorphic objects, where only some of the mappers include that
-    relationship, typically when :meth:`.PropComparator.of_type` is being used.

diff --git a/doc/build/changelog/unreleased_12/4157.rst b/doc/build/changelog/unreleased_12/4157.rst
deleted file mode 100644 (file)
index f687652..0000000
--- a/doc/build/changelog/unreleased_12/4157.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: bug, oracle
-    :tickets: 4157
-
-    Fixed regression where the removal of most setinputsizes
-    rules from cx_Oracle dialect impacted the TIMESTAMP
-    datatype's ability to retrieve fractional seconds.
-
-

diff --git a/doc/build/changelog/unreleased_12/4159.rst b/doc/build/changelog/unreleased_12/4159.rst
deleted file mode 100644 (file)
index 5ed2773..0000000
--- a/doc/build/changelog/unreleased_12/4159.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4159
-
-    Fixed regression where pickle format of a Load / _UnboundLoad object (e.g.
-    loader options) changed and ``__setstate__()`` was raising an
-    UnboundLocalError for an object received from the legacy format, even
-    though an attempt was made to do so.  tests are now added to ensure this
-    works.

diff --git a/doc/build/changelog/unreleased_12/fix_oracle_test_rule.rst b/doc/build/changelog/unreleased_12/fix_oracle_test_rule.rst
deleted file mode 100644 (file)
index 073414a..0000000
--- a/doc/build/changelog/unreleased_12/fix_oracle_test_rule.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-.. change::
-    :tags: bug, tests
-
-    Removed an oracle-specific requirements rule from the public
-    test suite that was interfering with third party dialect
-    suites.

diff --git a/doc/build/changelog/unreleased_12/groupby_rule.rst b/doc/build/changelog/unreleased_12/groupby_rule.rst
deleted file mode 100644 (file)
index c012f57..0000000
--- a/doc/build/changelog/unreleased_12/groupby_rule.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-.. change::
-    :tags: bug, tests
-
-    Added a new exclusion rule group_by_complex_expression
-    which disables tests that use "GROUP BY <expr>", which seems
-    to be not viable for at least two third party dialects.

diff --git a/doc/build/changelog/unreleased_12/pr411.rst b/doc/build/changelog/unreleased_12/pr411.rst
deleted file mode 100644 (file)
index b329347..0000000
--- a/doc/build/changelog/unreleased_12/pr411.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-.. change::
-    :tags: bug, oracle
-
-    Fixed regression in Oracle imports where a missing comma caused
-    an undefined symbol to be present.  Pull request courtesy
-    Miroslav Shubernetskiy.

diff --git a/doc/build/conf.py b/doc/build/conf.py
index 2ee539013b5f5c153596ce06f4dd2ca0a081313b..8c2ed5f15bfbd1e7ce7401a2f66037dad6967c0b 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.0"
+release = "1.2.1"
 
-release_date = "December 27, 2017"
+release_date = "January 15, 2018"
 
 site_base = os.environ.get("RTD_SITE_BASE", "http://www.sqlalchemy.org")
 site_adapter_template = "docs_adapter.mako"