summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-11-17 02:05:02 -0600
committerMichael Merickel <michael@merickel.org>2014-11-17 02:05:02 -0600
commite07af13b19b8fb00a393bb91b950b516cfca1cb6 (patch)
treea18c92e500f059312daa9e44bf3ee73f5dc508d0 /.travis.yml
parent6beffc41634844f3ea3b6152f292d3dbe6b5500c (diff)
parent1d298deae192918a994423c3fc4ee9cd4bf7e7ca (diff)
downloadpyramid-e07af13b19b8fb00a393bb91b950b516cfca1cb6.tar.gz
pyramid-e07af13b19b8fb00a393bb91b950b516cfca1cb6.tar.bz2
pyramid-e07af13b19b8fb00a393bb91b950b516cfca1cb6.zip
Merge branch 'master' into feature.security-docs-enhancements
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..4ff4939d9 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:
+ - 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: