Skip to content

Commit

Permalink
Merge pull request #5 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 7b02499 + b852aa0 commit 80e111f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
language: python
sudo: false
python:
- 2.6
- 2.7
- 3.2
- 3.3
- 3.4
- 3.5
Expand Down
6 changes: 4 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
``zope.exceptions`` Changelog
=============================

4.0.9 (unreleased)
4.1.0 (unreleased)
------------------

- Drop support for Python 2.6 and 3.2.

- Make ``exceptionformatter.extract_stack`` signature comply with
``traceback.extract_stack``

- Claim support for Python 3.5.
- Add support for Python 3.5.

4.0.8 (2015-08-13)
------------------
Expand Down
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def alltests():
return unittest.TestSuite(suites)

setup(name='zope.exceptions',
version='4.0.9.dev0',
version='4.1.0.dev0',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
description='Zope Exceptions',
Expand All @@ -55,10 +55,8 @@ 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.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
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,py35,pypy,pypy3,coverage,docs
py27,py33,py34,py35,pypy,pypy3,coverage,docs

[testenv]
commands =
Expand Down

0 comments on commit 80e111f

Please sign in to comment.