Skip to content

Commit

Permalink
Merge pull request #1 from zopefoundation/drop-py26-py32-support
Browse files Browse the repository at this point in the history
Drop support for Python 2.6 and 3.2.
  • Loading branch information
tseaver committed Mar 24, 2016
2 parents be3ece9 + b01e7ba commit d281b95
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 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
python:
- 2.6
- 2.7
- 3.3
- 3.4
Expand Down
4 changes: 2 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Changelog
=========

2.1.1 (unreleased)
2.2.0 (unreleased)
------------------

- TBD
- Drop support for Python 2.6 and 3.2.

2.1.0 (2014-12-26)
------------------
Expand Down
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()

setup(name='zope.browser',
version='2.1.1.dev0',
version='2.2.0.dev0',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
description='Shared Zope Toolkit browser components',
Expand All @@ -40,10 +40,8 @@ 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.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: Implementation :: CPython',
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,py32,py33,py34,pypy,pypy3
py27,py33,py34,pypy,pypy3

[testenv]
commands =
Expand Down

0 comments on commit d281b95

Please sign in to comment.