summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2014-12-27 17:38:21 -0500
committerTres Seaver <tseaver@palladion.com>2014-12-27 17:38:21 -0500
commitdad79fb7e2148bb3eb51e46f84f89f3e941058d0 (patch)
tree5e4274681a825266c7684bb8cdca2fe0892241ea
parent6457fbfd322912adc2e8a07fd66a682c950a4ef6 (diff)
downloadzope-pagetemplate-dad79fb7e2148bb3eb51e46f84f89f3e941058d0.tar.gz
Add support for Python 3.4.
-rw-r--r--.travis.yml1
-rw-r--r--CHANGES.rst4
-rw-r--r--setup.py2
-rw-r--r--tox.ini2
4 files changed, 7 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 22706ab..9e115ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ env:
- TOXENV=py26
- TOXENV=py27
- TOXENV=py33
+ - TOXENV=py34
install:
- travis_retry pip install tox
script:
diff --git a/CHANGES.rst b/CHANGES.rst
index d50f977..7ea5eaa 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,9 @@ Changes
4.0.5 (unreleased)
------------------
-- TBD
+- Add support for Python 3.4.
+
+- Add support for testing on Travis.
4.0.4 (2013-03-15)
diff --git a/setup.py b/setup.py
index 5d6cae0..d00d0cb 100644
--- a/setup.py
+++ b/setup.py
@@ -97,6 +97,8 @@ setup(name='zope.pagetemplate',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: Implementation :: CPython',
'Natural Language :: English',
'Operating System :: OS Independent',
'Topic :: Internet :: WWW/HTTP',
diff --git a/tox.ini b/tox.ini
index 8048286..d8d3db1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
- py26,py27,py33
+ py26,py27,py33,py34
[testenv]
deps =