Skip to content

Commit

Permalink
Merge pull request #12 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 dee353a + 97aea54 commit e3e3cc9
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 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,10 +1,12 @@
Changes
=======

4.5.1 (unreleased)
4.6.0 (unreleased)
------------------

- Claim support for Python 3.5.
- Drop support for Python 2.6 and 3.2.

- Add support for Python 3.5.


4.5.0 (2015-09-02)
Expand Down
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def read(*rnames):

setup(
name='zope.testing',
version='4.5.1.dev0',
version='4.6.0.dev0',
url='http://pypi.python.org/pypi/zope.testing',
license='ZPL 2.1',
description='Zope testing helpers',
Expand All @@ -71,11 +71,8 @@ def read(*rnames):
"Operating System :: OS Independent",
"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.1",
"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
py27,py33,py34,py35,pypy,pypy3

[testenv]
commands =
Expand Down

0 comments on commit e3e3cc9

Please sign in to comment.