summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml1
-rw-r--r--CHANGES.txt2
-rw-r--r--tox.ini2
3 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 4ff4939d9..5a205b268 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ env:
- TOXENV=py33
- TOXENV=py34
- TOXENV=pypy
+ - TOXENV=pypy3
- TOXENV=cover
install:
diff --git a/CHANGES.txt b/CHANGES.txt
index c7c829fb6..ea3323aa0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,8 @@ Next release
Features
--------
+- Added support / testing for 'pypy3' under Tox and Travis.
+
- Cache busting for static resources has been added and is available via a new
argument to ``pyramid.config.Configurator.add_static_view``: ``cachebust``.
See https://github.com/Pylons/pyramid/pull/1380
diff --git a/tox.ini b/tox.ini
index 9a9c5a983..3f32dbc3f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
- py26,py27,py32,py33,py34,pypy,cover
+ py26,py27,py32,py33,py34,pypy,pypy3,cover
[testenv]
commands =