summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-11-17 01:23:42 -0600
committerMichael Merickel <michael@merickel.org>2014-11-17 01:23:42 -0600
commit34a35e4f35d9930e0941009a7f31c5b0df14f9c7 (patch)
tree8dfbc6eae3e5e3d92cadf1128b2895816090ca3c
parent46225d3323b761196c045de8e79145baa80192ea (diff)
parentd965c4fa42aa04888e5a829d9975ffec26037c9b (diff)
downloadpyramid-34a35e4f35d9930e0941009a7f31c5b0df14f9c7.tar.gz
pyramid-34a35e4f35d9930e0941009a7f31c5b0df14f9c7.tar.bz2
pyramid-34a35e4f35d9930e0941009a7f31c5b0df14f9c7.zip
Merge pull request #1459 from sontek/use_tox_for_travis
Switch to using tox for travis so coverage is ran
-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: