diff options
author | Tres Seaver <tseaver@palladion.com> | 2016-03-24 10:46:22 -0400 |
---|---|---|
committer | Tres Seaver <tseaver@palladion.com> | 2016-03-24 10:46:22 -0400 |
commit | afe262316a049942007c8242a54d6e668d175c86 (patch) | |
tree | 390887a0b4d3a7c0d681b1101a2249b5ec9ea975 | |
parent | b84be9b8ac0f41d232add6a61610b4d146e32208 (diff) | |
parent | bc0c150379c4b0985a5c860f35bae8a04362a8bd (diff) | |
download | zope-contenttype-afe262316a049942007c8242a54d6e668d175c86.tar.gz |
Merge pull request #1 from zopefoundation/drop-py26-support
Drop support for Python 2.6.
-rw-r--r-- | .travis.yml | 1 | ||||
-rw-r--r-- | CHANGES.rst | 4 | ||||
-rw-r--r-- | setup.py | 3 | ||||
-rw-r--r-- | tox.ini | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index d409a1c..f000d5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: python sudo: false python: - - 2.6 - 2.7 - 3.3 - 3.4 diff --git a/CHANGES.rst b/CHANGES.rst index 37f063b..35c22a4 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,10 +1,10 @@ Change History ============== -4.1.1 (unreleased) +4.2.0 (unreleased) ------------------ -- TBD +- Drop support for Python 2.6. 4.1.0 (2014-12-26) ------------------ @@ -31,7 +31,7 @@ long_description = read('README.rst') + '\n' + read('CHANGES.rst') setup( name='zope.contenttype', - version='4.1.1.dev0', + version='4.2.0.dev0', url='http://pypi.python.org/pypi/zope.contenttype', author='Zope Foundation and Contributors', author_email='zope-dev@zope.org', @@ -42,7 +42,6 @@ setup( 'License :: OSI Approved :: Zope Public License', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3', @@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py33,py34,pypy,pypy3,coverage + py27,py33,py34,pypy,pypy3,coverage [testenv] commands = |