summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-28 04:48:39 -0400
committerChris McDonough <chrism@plope.com>2011-09-28 04:48:39 -0400
commit311a894e32936a1087cb44543183da67d8c7fdec (patch)
tree98ae57cf94166e698351ab4f16d0a83236765687 /tox.ini
parentbbc4f46ccf6b3e9c2235f0fd60622a0deff6b30e (diff)
parentdd5a91eb937369d06f3fc438c817e046fc81f891 (diff)
downloadpyramid-311a894e32936a1087cb44543183da67d8c7fdec.tar.gz
pyramid-311a894e32936a1087cb44543183da67d8c7fdec.tar.bz2
pyramid-311a894e32936a1087cb44543183da67d8c7fdec.zip
Merge branch 'token-reissue' of https://github.com/wichert/pyramid into wichert-token-reissue
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini16
1 files changed, 12 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index 40711a5f2..a422b2eb6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,19 +1,25 @@
[tox]
envlist =
- py25,py26,py27,jython,pypy,cover
+ py26,py27,py32,pypy,cover
[testenv]
commands =
python setup.py test -q
deps =
+ https://github.com/Pylons/webob/zipball/master
+ zope.component
Sphinx
- WebTest
repoze.sphinx.autointerface
+ WebTest
virtualenv
-[testenv:jython]
+[testenv:py32]
commands =
- jython setup.py test -q
+ python setup.py test -q
+deps =
+ https://github.com/Pylons/webob/zipball/master
+ WebTest
+ virtualenv
[testenv:cover]
basepython =
@@ -21,6 +27,8 @@ basepython =
commands =
python setup.py nosetests --with-xunit --with-xcoverage
deps =
+ https://github.com/Pylons/webob/zipball/master
+ zope.component
Sphinx
WebTest
repoze.sphinx.autointerface