summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2016-09-14 16:09:42 -0400
committerChris McDonough <chrism@plope.com>2016-09-14 16:09:42 -0400
commit85bd2b8187c39e44285983261a74aa815f2b19ed (patch)
tree4bc2269119fbe03d1fa54171148ff0cc5d88fd93 /.travis.yml
parentd350714a917b1a06dd4be6092e7b3da64771a4af (diff)
parent4acd85dc98fb2a43eae54d2116cc4bf383157269 (diff)
downloadpyramid-85bd2b8187c39e44285983261a74aa815f2b19ed.tar.gz
pyramid-85bd2b8187c39e44285983261a74aa815f2b19ed.tar.bz2
pyramid-85bd2b8187c39e44285983261a74aa815f2b19ed.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
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