Skip to content

Commit

Permalink
Merge pull request #2 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 992f74f + 5a341c6 commit 81ff084
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
@@ -1,9 +1,7 @@
language: python
sudo: false
python:
- 2.6
- 2.7
- 3.2
- 3.3
- 3.4
- pypy
Expand Down
4 changes: 2 additions & 2 deletions CHANGES.rst
@@ -1,10 +1,10 @@
Changes
=======

4.1.2 (unreleased)
4.2.0 (unreleased)
------------------

- TBD
- Drop support for Python 2.6 and 3.2.


4.1.1 (2015-06-06)
Expand Down
4 changes: 1 addition & 3 deletions setup.py
Expand Up @@ -43,7 +43,7 @@ def alltests():
return unittest.TestSuite(suites)

setup(name='zope.tales',
version='4.1.2.dev0',
version='4.2.0.dev0',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
description='Zope Template Application Language Expression Syntax '
Expand All @@ -61,10 +61,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 :: Implementation :: CPython',
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
@@ -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 81ff084

Please sign in to comment.