summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-07-24 17:14:51 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-07-24 17:18:05 -0400
commit295f5e5deeec6dc4a94bca4fa1152490e64b8e49 (patch)
tree1f708ec597b048c6a1e14b37d03919a48da97840
parent81f34b2f33b8aa55bc587994125d65244fdf5e52 (diff)
downloadsqlalchemy-295f5e5deeec6dc4a94bca4fa1152490e64b8e49.tar.gz
- 1.0.18 release date
(cherry picked from commit f00391a070d9031941bb1c17aecb265b566a6a5b) Change-Id: I243a63d084d4b369ded7969d78e3ab033f6189bd
-rw-r--r--doc/build/changelog/changelog_10.rst20
-rw-r--r--doc/build/changelog/unreleased_10/3937.rst9
-rw-r--r--doc/build/changelog/unreleased_10/4034.rst7
3 files changed, 19 insertions, 17 deletions
diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index 95ec16321..128e23278 100644
--- 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
index 191da65e8..000000000
--- 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
index ac4f229b0..000000000
--- 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