Merge pull request #3321 from mmerickel/travis-pypy

test on newer pypy/pypy3
Pylons · Aug 2, 2018 · 5b1e295 · 5b1e295
2 parents 54533fa + fa99927
commit 5b1e295
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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