diff options
| author | Michael Merickel <michael@merickel.org> | 2014-11-21 13:50:12 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2014-11-21 13:50:12 -0600 |
| commit | f6b30ee045fdf5c63daff1168a47016b8aded919 (patch) | |
| tree | 28e180eb111a424264894d4339b0827e9c49d21c | |
| parent | 574f16d75fa2bab304e8dbd59bb6e6950cc475ea (diff) | |
| parent | bc8e4d2acf583b9c581202c0f0efee3ee1da710a (diff) | |
| download | pyramid-f6b30ee045fdf5c63daff1168a47016b8aded919.tar.gz pyramid-f6b30ee045fdf5c63daff1168a47016b8aded919.tar.bz2 pyramid-f6b30ee045fdf5c63daff1168a47016b8aded919.zip | |
Merge pull request #1469 from Pylons/testing-add-pypy3
Add support for testing 'pypy3' under Tox / Travis.
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | CHANGES.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
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 @@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py32,py33,py34,pypy,cover + py26,py27,py32,py33,py34,pypy,pypy3,cover [testenv] commands = |