summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-08-01 22:25:34 -0500
committerMichael Merickel <michael@merickel.org>2018-08-01 22:25:34 -0500
commitfa99927b75b3a0373896e566ee059f49f67ff8ea (patch)
tree94ccc48e03e6e80488b987b5c5e8b3d861d2690b
parent54533fa2e3f1008df94172b3647a759078224930 (diff)
downloadpyramid-fa99927b75b3a0373896e566ee059f49f67ff8ea.tar.gz
pyramid-fa99927b75b3a0373896e566ee059f49f67ff8ea.tar.bz2
pyramid-fa99927b75b3a0373896e566ee059f49f67ff8ea.zip
test on newer pypy/pypy3
-rw-r--r--.travis.yml5
-rw-r--r--tox.ini3
2 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 9e296f987..9884c3d19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,10 @@ matrix:
env: TOXENV=py35
- python: 3.6
env: TOXENV=py36
- # aws s3 ls s3://travis-python-archives/binaries/ubuntu/14.04/x86_64/ | grep 'pypy.*bz2$'
- - python: pypy-5.4.1
+ - python: pypy
env: TOXENV=pypy
+ - python: pypy3
+ env: TOXENV=pypy3
- python: 3.5
env: TOXENV=py2-cover,py3-cover,coverage
- python: 3.5
diff --git a/tox.ini b/tox.ini
index 50ff4f166..4dcc219c0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
[tox]
envlist =
lint,
- py27,py34,py35,py36,pypy,
+ py27,py34,py35,py36,pypy,pypy3,
docs,{py2,py3}-cover,coverage,
[testenv]
@@ -14,6 +14,7 @@ basepython =
py36: python3.6
py37: python3.7
pypy: pypy
+ pypy3: pypy3
py2: python2.7
py3: python3.5