Skip to content

Commit

Permalink
Merge pull request #5 from zopefoundation/drop-py26-support
Browse files Browse the repository at this point in the history
Drop support for Python 2.6.
  • Loading branch information
tseaver committed Mar 24, 2016
2 parents 14d1298 + c4e3945 commit 2e02837
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
1 change: 0 additions & 1 deletion .travis.yml
@@ -1,7 +1,6 @@
language: python
sudo: false
env:
- TOXENV=py26
- TOXENV=py27
- TOXENV=pypy
- TOXENV=py33
Expand Down
4 changes: 2 additions & 2 deletions 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 (2015-05-22)
------------------
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Expand Up @@ -84,7 +84,7 @@ def alltests():


setup(name='zope.container',
version='4.1.1.dev0',
version='4.2.0.dev0',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
description='Zope Container',
Expand All @@ -101,7 +101,6 @@ def alltests():
'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',
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist = py26,py27,pypy,py33,py34,py27-zodb,pypy-zodb,py27-pure-zodb,docs
envlist = py27,pypy,py33,py34,py27-zodb,pypy-zodb,py27-pure-zodb,docs

[testenv]
commands = python setup.py -q test -q
Expand Down

0 comments on commit 2e02837

Please sign in to comment.