summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-11-17 02:27:03 -0600
committerMichael Merickel <michael@merickel.org>2014-11-17 02:27:03 -0600
commit5d0b1beaf3b09045fd3dd71244938ee6e391ebf3 (patch)
tree2fd3a374d4c937184497e5589bcf93391833949a /.travis.yml
parent650d3d5fa383d89a3b28029162d6ef4d58be3da1 (diff)
parentc0f1fc8d31df45371d5ae6689d3e0a39c058c3ac (diff)
downloadpyramid-5d0b1beaf3b09045fd3dd71244938ee6e391ebf3.tar.gz
pyramid-5d0b1beaf3b09045fd3dd71244938ee6e391ebf3.tar.bz2
pyramid-5d0b1beaf3b09045fd3dd71244938ee6e391ebf3.zip
Merge branch 'master' into feature.override-asset-with-absolute-path
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml21
1 files changed, 12 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index ce27b5ec3..4ff4939d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,20 @@
# Wire up travis
language: python
-python:
- - 2.6
- - 2.7
- - pypy
- - 3.2
- - 3.3
- - 3.4
+env:
+ - TOXENV=py26
+ - TOXENV=py27
+ - TOXENV=py32
+ - TOXENV=py33
+ - TOXENV=py34
+ - TOXENV=pypy
+ - TOXENV=cover
-install: python setup.py dev
+install:
+ - travis_retry pip install tox
-script: python setup.py test -q
+script:
+ - travis_retry tox
notifications:
email: