summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-11-17 02:18:15 -0600
committerMichael Merickel <michael@merickel.org>2014-11-17 02:18:15 -0600
commit0c5e5ac9bbb9d0e1bc4aa8f3497f2c7f54ca96d3 (patch)
treeaf1f326e83b8e799abe17bad6f1259185b52f813 /.travis.yml
parent823ac447329e46e5826e8e3228d9f847f9790ee8 (diff)
parentc0f1fc8d31df45371d5ae6689d3e0a39c058c3ac (diff)
downloadpyramid-0c5e5ac9bbb9d0e1bc4aa8f3497f2c7f54ca96d3.tar.gz
pyramid-0c5e5ac9bbb9d0e1bc4aa8f3497f2c7f54ca96d3.tar.bz2
pyramid-0c5e5ac9bbb9d0e1bc4aa8f3497f2c7f54ca96d3.zip
Merge branch 'master' into feature.pshell-pythonstartup
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: