diff options
| author | cewing <cris@crisewing.com> | 2016-10-22 12:35:21 -0400 |
|---|---|---|
| committer | cewing <cris@crisewing.com> | 2016-10-22 12:35:21 -0400 |
| commit | 03f6d630364a9adf438e0bd7d7b9f3bc3175f093 (patch) | |
| tree | de2aed9476c9d569375287a4ea89e9faf0f7b73a /.travis.yml | |
| parent | 1610c8fd3605f2ed481c37da27a1ce059419888a (diff) | |
| parent | e73ae375581539ed42aa97d7cd6e96e6fbd64c79 (diff) | |
| download | pyramid-03f6d630364a9adf438e0bd7d7b9f3bc3175f093.tar.gz pyramid-03f6d630364a9adf438e0bd7d7b9f3bc3175f093.tar.bz2 pyramid-03f6d630364a9adf438e0bd7d7b9f3bc3175f093.zip | |
Merge branch 'master' into issue.2614
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 |