Merge pull request #2 from zopefoundation/drop-py26-support

Drop support for Python 2.6.
zopefoundation · Mar 24, 2016 · 890a317 · 890a317
2 parents a44a998 + 5f61bba
commit 890a317
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: python
 sudo: false
 env:
-    - TOXENV=py26
     - TOXENV=py27
     - TOXENV=py33
     - TOXENV=py34

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,10 +1,10 @@
 Changes
 =======
 
-4.1.1 (unreleased)
+4.2.0 (unreleased)
 ------------------
 
-- TBD
+- Drop support for Python 2.6.
 
 
 4.1.0 (2014-12-26)

diff --git a/setup.py b/setup.py
@@ -40,7 +40,7 @@ def test_suite():
 long_description = read('README.rst') + '\n\n' + read('CHANGES.rst')
 
 setup(name='zope.browserresource',
-      version='4.1.1.dev0',
+      version='4.2.0.dev0',
       url='http://pypi.python.org/pypi/zope.browserresource/',
       author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
@@ -50,7 +50,6 @@ def test_suite():
             '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',

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py33,py34,pypy,pypy3
+envlist = py27,py33,py34,pypy,pypy3
 
 [testenv]
 commands = python setup.py -q test -q