diff options
author | Tres Seaver <tseaver@palladion.com> | 2016-04-13 14:25:33 -0400 |
---|---|---|
committer | Tres Seaver <tseaver@palladion.com> | 2016-04-13 14:25:33 -0400 |
commit | 5e41a96e8a9cd3abed31fe9bdeefb9e8957377fd (patch) | |
tree | 5603aaea2b036c0693e33d37ad5ab9b0cb239d5d | |
parent | 96db2e6003b5f26e1cbe74e177ea378bf4558e03 (diff) | |
parent | 302877b8c1e861258d137a2a849520f2143ad97f (diff) | |
download | zope-pagetemplate-5e41a96e8a9cd3abed31fe9bdeefb9e8957377fd.tar.gz |
Merge pull request #7 from zopefoundation/add-py35-support
Add support for Python 3.5.
-rw-r--r-- | .travis.yml | 17 | ||||
-rw-r--r-- | CHANGES.rst | 2 | ||||
-rw-r--r-- | setup.py | 3 | ||||
-rw-r--r-- | tox.ini | 2 |
4 files changed, 14 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 78e3892..37c5317 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,15 @@ language: python sudo: false -env: - - TOXENV=py27 - - TOXENV=py33 - - TOXENV=py34 - - TOXENV=pypy - - TOXENV=pypy3 +python: + - 2.7 + - 3.3 + - 3.4 + - 3.5 + - pypy + - pypy3 install: - - travis_retry pip install tox + - pip install tox-travis script: - - tox + - tox notifications: email: false diff --git a/CHANGES.rst b/CHANGES.rst index a9dbe8f..78f1827 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,8 @@ Changes 4.3.0 (unreleased) ------------------ +- Add support for Python 3.5. + - Drop support for Python 2.6 and 3.2. 4.2.1 (2015-06-06) @@ -97,6 +97,7 @@ setup(name='zope.pagetemplate', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Natural Language :: English', @@ -117,7 +118,7 @@ setup(name='zope.pagetemplate', 'zope.interface', 'zope.component', 'zope.tales', - 'zope.tal', + 'zope.tal >= 4.2.0', 'zope.i18n >= 4.0.1', 'zope.i18nmessageid', 'zope.traversing', @@ -1,6 +1,6 @@ [tox] envlist = - py27,py33,py34,pypy,pypy3 + py27,py33,py34,py35,pypy,pypy3 [testenv] deps = |