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

Drop support for Python 2.6.
zopefoundation · Mar 24, 2016 · e826f2a · e826f2a
2 parents 93a3589 + 2b2c6f9
commit e826f2a
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
 python:
-    - 2.6
     - 2.7
     - 3.3
     - 3.4

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-27)
 ------------------

diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@ def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name = 'zope.intid',
-      version='4.1.1.dev0',
+      version='4.2.0.dev0',
       author='Albertas Agejevas and Gintautas Miliauskas',
       maintainer='Zope developers',
       maintainer_email='zope-dev@zope.org',
@@ -43,7 +43,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,pypy3
+    py27,py33,py34,pypy,pypy3
 
 [testenv]
 commands =