summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-11-30 12:40:51 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2015-11-30 12:41:10 -0500
commit2c5ba60269c835fba61ff7e8aadfbad1e3edd1b8 (patch)
tree488a618adc24e37822e5f44ec3356710b007dd00
parenta058233f55b293919c02116b66336fae9bc38700 (diff)
downloadsqlalchemy-2c5ba60269c835fba61ff7e8aadfbad1e3edd1b8.tar.gz
- update changelog for all the py3.5/3.6 related prs at once
(cherry picked from commit 4bb6770ae872b69bd65ba0d67a7e1453d1a4e14b)
-rw-r--r--doc/build/changelog/changelog_10.rst11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index 537f750ca..b7b792d4d 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -31,12 +31,13 @@
.. change::
:tags: bug, py3k
:versions: 1.1.0b1
- :pullreq: github:210
+ :pullreq: github:210, github:218, github:211
- Updates to internal getargspec() calls, as well as some py36-related
- fixture updates, to allow tests to pass without
- warnings on Py3.5, Py3.6, pull requests courtesy Jacob MacDonald
- and Luri de Silvio.
+ Updates to internal getargspec() calls, some py36-related
+ fixture updates, and alterations to two iterators to "return" instead
+ of raising StopIteration, to allow tests to pass without
+ errors or warnings on Py3.5, Py3.6, pull requests courtesy
+ Jacob MacDonald, Luri de Silvio, and Phil Jones.
.. change::
:tags: bug, ext