Skip to content

Commit

Permalink
Drop official support for Python 2.6
Browse files Browse the repository at this point in the history
close #1274
  • Loading branch information
sloria committed Jul 2, 2019
1 parent 72c6a88 commit 66432ca
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 6 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
Changelog
---------

2.20.0 (unreleased)
*******************

Deprecation/Removal:

- Python 2.6 is no longer officially supported (:issue:`1274`).
NOTE: Dropping "official support" in this case means we will not test
against Python 2.6 in CI, but the code is still expected to work with Python 2.6.

2.19.5 (2019-06-18)
+++++++++++++++++++

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ To run syntax checks: ::

$ tox -e lint

(Optional) To run tests on Python 2.6, 2.7, 3.4, 3.5, and 3.6 virtual environments (must have each interpreter installed): ::
(Optional) To run tests on Python 2.7, 3.4, 3.5, and 3.6 virtual environments (must have each interpreter installed): ::

$ tox

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Full documentation is available at http://marshmallow.readthedocs.io/ .
Requirements
============

- Python >= 2.6 or >= 3.4
- Python >= 2.7 or >= 3.4

marshmallow has no external dependencies outside of the Python standard library, although `python-dateutil <https://pypi.python.org/pypi/python-dateutil>`_ is recommended for robust datetime deserialization.

Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ resources:
jobs:
- template: job--python-tox.yml@sloria
parameters:
toxenvs: [lint, py26, py27, py34, py35, py36, py37, docs]
toxenvs: [lint, py27, py34, py35, py36, py37, docs]
os: linux
- template: job--pypi-release.yml@sloria
parameters:
Expand Down
2 changes: 1 addition & 1 deletion docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Installation
============

**marshmallow** requires Python >= 2.6 or >= 3.4. It has no external dependencies other than the Python standard library.
**marshmallow** requires Python >= 2.7 or >= 3.4. It has no external dependencies other than the Python standard library.

.. note::

Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ def read(fname):
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = lint,py26,py27,py34,py35,docs
envlist = lint,py27,py34,py35,docs

[testenv]
extras = tests,reco
Expand Down

0 comments on commit 66432ca

Please sign in to comment.