Update docs and changelog

lyft · May 5, 2019 · 25efcd0 · 25efcd0
1 parent 719bac1
commit 25efcd0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,11 +1,13 @@
 Changelog
 ---------
 
-3.0.0 (unreleased)
+3.0.0rc6 (unreleased)
 ++++++++++++++++++
 
 Other changes:
 
+- *Backwards-incompatible*: Remove support for Python 2 (:issue:`1120`).
+  Thank you :user:`rooterkyberian` for the suggestion and the PR.
 - *Backwards-incompatible*: Remove special-casing in ``fields.List`` and
   ``fields.Tuple`` for accessing nested attributes (:pr:`1188`).
   Use ``fields.List(fields.Pluck(...))`` instead.

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -127,7 +127,7 @@ To run syntax checks: ::
 
     $ tox -e lint
 
-(Optional) To run tests on Python 2.7, 3.5, 3.6, and 3.7 virtual environments (must have each interpreter installed): ::
+(Optional) To run tests in all supported Python versions in their own virtual environments (must have each interpreter installed): ::
 
     $ tox
 

diff --git a/docs/upgrading.rst b/docs/upgrading.rst
@@ -11,9 +11,9 @@ Upgrading to 3.0
 Python compatibility
 ********************
 
-The marshmallow 3.x series supports Python 2.7 and >= 3.5.
+The marshmallow 3.x series supports Python >= 3.5.
 
-Python 2.6, 3.3, and 3.4 are no longer supported.
+Python 2.6, 2.7, 3.3, and 3.4 are no longer supported.
 
 
 Schemas are always strict