summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-08-10 10:28:04 -0500
committerGitHub <noreply@github.com>2018-08-10 10:28:04 -0500
commit3ee04cc62205b10eb9041b0df5e156936765202f (patch)
tree666862c069fce963e4fac454b767f08586687686 /.travis.yml
parent0ad05afc020d2790048d4ca85d936b4ea79eae13 (diff)
parent0760eba8fd5a0d8f0424c329ce92e9fb8d003f11 (diff)
downloadpyramid-3ee04cc62205b10eb9041b0df5e156936765202f.tar.gz
pyramid-3ee04cc62205b10eb9041b0df5e156936765202f.tar.bz2
pyramid-3ee04cc62205b10eb9041b0df5e156936765202f.zip
Merge branch 'master' into feature/more-samesite-work
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml5
1 files changed, 3 insertions, 2 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