From 295f5e5deeec6dc4a94bca4fa1152490e64b8e49 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 24 Jul 2017 17:14:51 -0400 Subject: [PATCH] - 1.0.18 release date (cherry picked from commit f00391a070d9031941bb1c17aecb265b566a6a5b) Change-Id: I243a63d084d4b369ded7969d78e3ab033f6189bd --- doc/build/changelog/changelog_10.rst | 20 +++++++++++++++++++- doc/build/changelog/unreleased_10/3937.rst | 9 --------- doc/build/changelog/unreleased_10/4034.rst | 7 ------- 3 files changed, 19 insertions(+), 17 deletions(-) delete mode 100644 doc/build/changelog/unreleased_10/3937.rst delete mode 100644 doc/build/changelog/unreleased_10/4034.rst diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst index 95ec163219..128e232782 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 191da65e8e..0000000000 --- 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 ac4f229b0b..0000000000 --- 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 -- 2.47.3