Skip to content

Commit

Permalink
Merge pull request #3 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 930508f + 272f810 commit 67c2108
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: python
sudo: false
env:
- TOXENV=py26
- TOXENV=py27
- TOXENV=py33
- TOXENV=py34
Expand Down
4 changes: 2 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Changes
=======

4.1.1 (unreleased)
4.2.0 (unreleased)
------------------

- TBD
- Drop support for Python 2.6.

4.1.0 (2015-06-02)
------------------
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()

setup(name = 'zope.catalog',
version='4.1.1.dev0',
version='4.2.0.dev0',
author='Zope Corporation and Contributors',
author_email='zope-dev@zope.org',
description='Cataloging and Indexing Framework for the Zope Toolkit',
Expand All @@ -42,7 +42,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',
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py26,py27,py33,py34,pypy,pypy3,coverage,docs
py27,py33,py34,pypy,pypy3,coverage,docs

[testenv]
commands =
Expand Down

0 comments on commit 67c2108

Please sign in to comment.