merge heads

This commit is contained in:
Georg Brandl 2011-01-09 08:29:59 +01:00
commit bbd158ef27

12
tox.ini
View File

@ -1,5 +1,5 @@
[tox]
envlist=py24,py25,py26,py27,py31,du07,du06,du05
envlist=py24,py25,py26,py27,py31,pypy,du07,du06,du05
[testenv]
deps=nose
@ -12,9 +12,19 @@ deps=
nose
simplejson
[testenv:py25]
deps=
nose
simplejson
[testenv:py31]
deps=https://bitbucket.org/jpellerin/nose3/get/tip.zip
[testenv:pypy]
deps=
nose
simplejson
[testenv:du05]
deps=
nose