diff options
| author | Michael Merickel <michael@merickel.org> | 2016-09-28 20:38:15 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-09-28 20:38:15 -0500 |
| commit | 8ce5736478f035cc14cfd247e7d936dc4db1f7b5 (patch) | |
| tree | 48d48dc3433e915df60d2549cebab64762fdd4fd /.travis.yml | |
| parent | e8c66a339e9f7d83bd2408952de53ef30dba0794 (diff) | |
| parent | 7391d365ce68677c588cf60c1431d29a786c6e82 (diff) | |
| download | pyramid-8ce5736478f035cc14cfd247e7d936dc4db1f7b5.tar.gz pyramid-8ce5736478f035cc14cfd247e7d936dc4db1f7b5.tar.bz2 pyramid-8ce5736478f035cc14cfd247e7d936dc4db1f7b5.zip | |
Merge branch 'master' into exception_only
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index fbdd88224..b46f677a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,6 @@ matrix: include: - python: 2.7 env: TOXENV=py27 - - python: 3.3 - env: TOXENV=py33 - python: 3.4 env: TOXENV=py34 - python: 3.5 @@ -20,6 +18,10 @@ matrix: env: TOXENV=docs - python: 3.5 env: TOXENV=pep8 + - python: nightly + env: TOXENV=py36 + allow_failures: + - env: TOXENV=py36 install: - travis_retry pip install tox |