diff options
author | Tres Seaver <tseaver@palladion.com> | 2016-04-13 13:57:20 -0400 |
---|---|---|
committer | Tres Seaver <tseaver@palladion.com> | 2016-04-13 13:57:20 -0400 |
commit | 08f613773e729a8198fc3a5f168e289359dcb33f (patch) | |
tree | b4854ef8085a7065c9d6cb19d08f27360d68c5b1 | |
parent | afe262316a049942007c8242a54d6e668d175c86 (diff) | |
parent | 23b6815de7b666a72d9bba946469c0cee33acb52 (diff) | |
download | zope-contenttype-08f613773e729a8198fc3a5f168e289359dcb33f.tar.gz |
Merge pull request #2 from zopefoundation/add-py35-support
Add support for Python 3.5.
-rw-r--r-- | .travis.yml | 1 | ||||
-rw-r--r-- | CHANGES.rst | 2 | ||||
-rw-r--r-- | setup.py | 1 | ||||
-rw-r--r-- | tox.ini | 4 |
4 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index f000d5e..2428b54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ python: - 2.7 - 3.3 - 3.4 + - 3.5 - pypy - pypy3 install: diff --git a/CHANGES.rst b/CHANGES.rst index 35c22a4..37cb799 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,8 @@ Change History 4.2.0 (unreleased) ------------------ +- Add support for Python 3.5. + - Drop support for Python 2.6. 4.1.0 (2014-12-26) @@ -46,6 +46,7 @@ setup( 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Operating System :: OS Independent', @@ -1,12 +1,10 @@ [tox] envlist = - py27,py33,py34,pypy,pypy3,coverage + py27,py33,py34,py35,pypy,pypy3,coverage [testenv] commands = python setup.py -q test -q -# without explicit deps, setup.py test will download a bunch of eggs into $PWD -deps = [testenv:coverage] usedevelop = true |