summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorIan Joseph Wilson <ianjosephwilson@gmail.com>2012-06-17 10:34:48 -0700
committerIan Joseph Wilson <ianjosephwilson@gmail.com>2012-06-17 10:34:48 -0700
commit2e1d2009f3abe8163e9e2adc5ff5c0bbeb1b4630 (patch)
tree48244d0278a25f145e9d5e0f00703836a0492059 /tox.ini
parentcf46a12292cf15303d68d27c6ba4155ecc2b4586 (diff)
parent3da92290bfaa8b4072019c916e75cd96ebc0f6dc (diff)
downloadpyramid-2e1d2009f3abe8163e9e2adc5ff5c0bbeb1b4630.tar.gz
pyramid-2e1d2009f3abe8163e9e2adc5ff5c0bbeb1b4630.tar.bz2
pyramid-2e1d2009f3abe8163e9e2adc5ff5c0bbeb1b4630.zip
Merge branch 'master' of https://github.com/Pylons/pyramid
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini10
1 files changed, 9 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 97aa6c4d0..85bd41bda 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
- py26,py27,py32,pypy,cover
+ py26,py27,py32,py33,pypy,cover
[testenv]
commands =
@@ -21,6 +21,14 @@ deps =
virtualenv
venusian
+[testenv:py33]
+commands =
+ python setup.py test -q
+deps =
+ WebTest
+ virtualenv
+ venusian
+
[testenv:cover]
basepython =
python2.6