Merge branch 'master' into deprecate-skip

4 files changed, 7 insertions, 2 deletions

diff --git a/.travis.yml b/.travis.yml
index 5535154..f7d8a97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
+  - "3.5"
   - "pypy"
 
 # We have to pin Jinja2 < 2.7  for Python 3.2 because 2.7 drops/breaks support:
diff --git a/NEWS b/NEWS
index 43b6799..c34b2f9 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ Next
 Improvements
 ------------
 
+* Python 3.5 added to the list of supported platforms. (Jonathan Lange)
+
 * ``MatchesListwise`` has more informative error when lengths don't match.
   (Jonathan Lange)
 
@@ -20,6 +22,8 @@ Changes
 * ``TestCase.skip`` deprecated. Use ``skipTest`` instead.
   (Jonathan Lange, #988893)
 
+* Last release of testtools to support Python 3.2. (Jonathan Lange)
+
 1.8.1
 ~~~~~
 
diff --git a/README.rst b/README.rst
index 9cff307..d2ff7e0 100644
--- a/README.rst
+++ b/README.rst
@@ -31,7 +31,7 @@ under the same license as Python, see LICENSE for details.
 Required Dependencies
 ---------------------
 
- * Python 2.6+ or 3.0+ / pypy (2.x+)
+ * Python 2.6+ or 3.2+ / pypy (2.x+)
 
 If you would like to use testtools for earlier Python's, please use testtools
 0.9.15.
diff --git a/doc/overview.rst b/doc/overview.rst
index bf62a8e..c22967b 100644
--- a/doc/overview.rst
+++ b/doc/overview.rst
@@ -93,7 +93,7 @@ Cross-Python compatibility
 --------------------------
 
 testtools gives you the very latest in unit testing technology in a way that
-will work with Python 2.6, 2.7, 3.1 and 3.2.
+will work with Python 2.6, 2.7, 3.2, 3.3, 3.4, and 3.5.
 
 If you wish to use testtools with Python 2.4 or 2.5, then please use testtools
 0.9.15. Up to then we supported Python 2.4 and 2.5, but we found the