diff options
| author | Chris McDonough <chrism@plope.com> | 2015-03-11 12:41:21 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-03-11 12:41:21 -0400 |
| commit | b58909676c28080c320fdb4861b7a49f5728a3aa (patch) | |
| tree | 87d4da217a1609f2229fcda73acdde34e8532944 /.travis.yml | |
| parent | c0070c95eeb39186c7c2ea0dea6b972c5782f185 (diff) | |
| parent | 8ebde50fdc7322e82b96ad103ab168b92ca2b74a (diff) | |
| download | pyramid-b58909676c28080c320fdb4861b7a49f5728a3aa.tar.gz pyramid-b58909676c28080c320fdb4861b7a49f5728a3aa.tar.bz2 pyramid-b58909676c28080c320fdb4861b7a49f5728a3aa.zip | |
fix merge conflicts after merging master to fix.view-lookup branch; do the merge to see diffs more clearly
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index cb98fddbe..42b3073c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,9 @@ env: - TOXENV=py34 - TOXENV=pypy - TOXENV=pypy3 - - TOXENV=cover + - TOXENV=py2-docs + - TOXENV=py3-docs + - TOXENV=py2-cover,py3-cover,coverage install: - travis_retry pip install tox |