summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2015-11-25 20:52:14 -0800
committerSteve Piercy <web@stevepiercy.com>2015-11-25 20:52:14 -0800
commit9a51bff66332e4b2b9fb080ec74512347d722294 (patch)
tree8212ea4f9c6c096490fd9a27841922cf50ea3416 /.travis.yml
parent84a168ef5fd4bdd487226f43b8c0e16237e82e18 (diff)
parent2d9ed3f7c1fe314bef0f25c58bfa0a98dda83acc (diff)
downloadpyramid-9a51bff66332e4b2b9fb080ec74512347d722294.tar.gz
pyramid-9a51bff66332e4b2b9fb080ec74512347d722294.tar.bz2
pyramid-9a51bff66332e4b2b9fb080ec74512347d722294.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 79d9fa09d..2163eb8fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,8 @@ matrix:
- python: 3.5
env: TOXENV=py2-cover,py3-cover,coverage
- python: 3.5
+ env: TOXENV=docs
+ - python: 3.5
env: TOXENV=pep8
install: