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

Drop support for Python 2.6.
zopefoundation · Mar 24, 2016 · 617de6f · 617de6f
2 parents 1ba89a1 + 0bf769b
commit 617de6f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,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.2 (unreleased)
+4.2.0 (unreleased)
 ------------------
 
-- TBD
+- Drop support for Python 2.6.
 
 
 4.1.1 (2015-06-02)

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@ def read(*rnames):
         return f.read()
 
 setup(name='zope.principalannotation',
-      version='4.1.2.dev0',
+      version='4.2.0.dev0',
       author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
       description='Annotations for Zope Principals',
@@ -40,7 +40,6 @@ def read(*rnames):
           '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,6 +1,6 @@
 [tox]
 envlist =
-    py26,py27,py33,py34,pypy
+    py27,py33,py34,pypy
 
 [testenv]
 commands =