Merge pull request #1 from zopefoundation/drop-py26-py32-support

Drop support for Python 2.6 and 3.2.

4 files changed, 4 insertions, 7 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 18c1aad..3b97590 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,10 +1,10 @@
 Changelog
 =========
 
-2.1.1 (unreleased)
+2.2.0 (unreleased)
 ------------------
 
-- TBD
+- Drop support for Python 2.6 and 3.2.
 
 2.1.0 (2014-12-26)
 ------------------
diff --git a/setup.py b/setup.py
index be10ee9..99178b3 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.browser',
-    version='2.1.1.dev0',
+    version='2.2.0.dev0',
     author='Zope Foundation and Contributors',
     author_email='zope-dev@zope.org',
     description='Shared Zope Toolkit browser components',
@@ -40,10 +40,8 @@ setup(name='zope.browser',
         '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.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: Implementation :: CPython',
diff --git a/tox.ini b/tox.ini
index 52ac0d3..8fec485 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py26,py27,py32,py33,py34,pypy,pypy3
+    py27,py33,py34,pypy,pypy3
 
 [testenv]
 commands =