summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Anderson <sontek@gmail.com>2014-11-16 23:51:00 -0800
committerJohn Anderson <sontek@gmail.com>2014-11-16 23:51:00 -0800
commit8ad4fa89c3a69f709a4d713557846da198bf9cdb (patch)
tree5f498472996e2811136410dcc1d18486f7a974a2
parent749575a93961e76bcd623a1284a16e49304a4a56 (diff)
parent1d298deae192918a994423c3fc4ee9cd4bf7e7ca (diff)
downloadpyramid-8ad4fa89c3a69f709a4d713557846da198bf9cdb.tar.gz
pyramid-8ad4fa89c3a69f709a4d713557846da198bf9cdb.tar.bz2
pyramid-8ad4fa89c3a69f709a4d713557846da198bf9cdb.zip
Merge branch 'master' of https://github.com/Pylons/pyramid into fix_proutes_coverage
-rw-r--r--.travis.yml14
1 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index dddeb1df7..4ff4939d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,13 @@
language: python
env:
- - TOX_ENV=py26
- - TOX_ENV=py27
- - TOX_ENV=py32
- - TOX_ENV=py33
- - TOX_ENV=py34
- - TOX_ENV=pypy
- - TOX_ENV=cover
+ - TOXENV=py26
+ - TOXENV=py27
+ - TOXENV=py32
+ - TOXENV=py33
+ - TOXENV=py34
+ - TOXENV=pypy
+ - TOXENV=cover
install:
- travis_retry pip install tox