summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2016-03-23 22:38:30 -0400
committerTres Seaver <tseaver@palladion.com>2016-03-23 22:38:30 -0400
commitbc0c150379c4b0985a5c860f35bae8a04362a8bd (patch)
tree390887a0b4d3a7c0d681b1101a2249b5ec9ea975
parentb84be9b8ac0f41d232add6a61610b4d146e32208 (diff)
downloadzope-contenttype-drop-py26-support.tar.gz
Drop support for Python 2.6.drop-py26-support
-rw-r--r--.travis.yml1
-rw-r--r--CHANGES.rst4
-rw-r--r--setup.py3
-rw-r--r--tox.ini2
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)
------------------
diff --git a/setup.py b/setup.py
index a3b3090..675ab27 100644
--- a/setup.py
+++ b/setup.py
@@ -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',
diff --git a/tox.ini b/tox.ini
index 7ed0818..6a1f5c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
- py26,py27,py33,py34,pypy,pypy3,coverage
+ py27,py33,py34,pypy,pypy3,coverage
[testenv]
commands =