summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-07-29 10:01:40 -0400
committerChris McDonough <chrism@plope.com>2012-07-29 10:01:40 -0400
commitd204b348535e4f28df4d59d25aa9b493306d41e5 (patch)
tree8027ef04a07bd0c01f60d347d8fca2ec4d8acc7c /tox.ini
parentc7fcdf1665cfdc1173559baa0a56d9a06fcba448 (diff)
parent14f9fe44ec75c055d89374a7852e1ca2af0ff31c (diff)
downloadpyramid-d204b348535e4f28df4d59d25aa9b493306d41e5.tar.gz
pyramid-d204b348535e4f28df4d59d25aa9b493306d41e5.tar.bz2
pyramid-d204b348535e4f28df4d59d25aa9b493306d41e5.zip
Merge branch 'master' of 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