summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJohn Anderson <sontek@gmail.com>2014-11-16 23:27:08 -0800
committerJohn Anderson <sontek@gmail.com>2014-11-16 23:27:08 -0800
commit749575a93961e76bcd623a1284a16e49304a4a56 (patch)
tree0747c69d495d87cd5ab3579636c73905905a2270 /.travis.yml
parent36046388d5cbe99b8d972853efba03b2fb5aa203 (diff)
parent34a35e4f35d9930e0941009a7f31c5b0df14f9c7 (diff)
downloadpyramid-749575a93961e76bcd623a1284a16e49304a4a56.tar.gz
pyramid-749575a93961e76bcd623a1284a16e49304a4a56.tar.bz2
pyramid-749575a93961e76bcd623a1284a16e49304a4a56.zip
Merge branch 'master' of https://github.com/Pylons/pyramid into fix_proutes_coverage
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml22
1 files changed, 12 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index 4ca998c42..dddeb1df7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,20 @@
# Wire up travis
language: python
-python:
- - 2.6
- - 2.7
- - pypy
- - 3.2
- - 3.3
- - 3.4
- - pypy3
+env:
+ - TOX_ENV=py26
+ - TOX_ENV=py27
+ - TOX_ENV=py32
+ - TOX_ENV=py33
+ - TOX_ENV=py34
+ - TOX_ENV=pypy
+ - TOX_ENV=cover
-install: python setup.py dev
+install:
+ - travis_retry pip install tox
-script: python setup.py test -q
+script:
+ - travis_retry tox
notifications:
email: