- 1.0.18

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index c6db3df14d63ece13661474046b87e5c036c11e4..2e0b823e39595c1e8aaa236dce1cce63c5b5f53c 100644 (file)
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -18,7 +18,25 @@
 
 .. changelog::
     :version: 1.0.18
-    :include_notes_from: unreleased_10
+    :released: July 24, 2017
+
+    .. change::
+        :tags: bug, tests, py3k
+        :tickets: 4034
+        :versions: 1.0.18, 1.1.12, 1.2.0b2
+
+        Fixed issue in testing fixtures which was incompatible with a change
+        made as of Python 3.6.2 involving context managers.
+
+    .. change:: 3937
+        :tags: bug, oracle
+        :tickets: 3937
+        :versions: 1.1.7
+
+        A fix to cx_Oracle's WITH_UNICODE mode which was uncovered by the
+        fact that cx_Oracle 5.3 now seems to hardcode this flag on in
+        the build; an internal method that uses this mode wasn't using
+        the correct signature.
 
 
 .. changelog::

diff --git a/doc/build/changelog/unreleased_10/3937.rst b/doc/build/changelog/unreleased_10/3937.rst
deleted file mode 100644 (file)
index 191da65..0000000
--- a/doc/build/changelog/unreleased_10/3937.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change:: 3937
-    :tags: bug, oracle
-    :tickets: 3937
-    :versions: 1.1.7
-
-    A fix to cx_Oracle's WITH_UNICODE mode which was uncovered by the
-    fact that cx_Oracle 5.3 now seems to hardcode this flag on in
-    the build; an internal method that uses this mode wasn't using
-    the correct signature.

diff --git a/doc/build/changelog/unreleased_10/4034.rst b/doc/build/changelog/unreleased_10/4034.rst
deleted file mode 100644 (file)
index ac4f229..0000000
--- a/doc/build/changelog/unreleased_10/4034.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. change::
-    :tags: bug, tests, py3k
-    :tickets: 4034
-    :versions: 1.0.18, 1.1.12, 1.2.0b2
-
-    Fixed issue in testing fixtures which was incompatible with a change
-    made as of Python 3.6.2 involving context managers.
\ No newline at end of file

diff --git a/doc/build/conf.py b/doc/build/conf.py
index b04ba10b3bf7d2aba87bc8d5871350facb875858..8e87f18f7a9d214d3172bb3985bdb130b043a473 100644 (file)
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -112,9 +112,9 @@ copyright = u'2007-2017, the SQLAlchemy authors and contributors'
 # The short X.Y version.
 version = "1.0"
 # The full version, including alpha/beta/rc tags.
-release = "1.0.17"
+release = "1.0.18"
 
-release_date = "January 17, 2017"
+release_date = "July 24, 2017"
 
 site_base = os.environ.get("RTD_SITE_BASE", "http://www.sqlalchemy.org")
 site_adapter_template = "docs_adapter.mako"