From 743f7e8da59774ccb39f744f47fa24ae10a6d90b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Neuh=C3=A4user?= Date: Sat, 8 Jan 2011 21:17:57 +0100 Subject: [PATCH 1/2] Add simplejson as a dependency for python 2.5 --- tox.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tox.ini b/tox.ini index cd6b248ef..0d41f0395 100644 --- a/tox.ini +++ b/tox.ini @@ -12,6 +12,11 @@ deps= nose simplejson +[testenv:py25] +deps= + nose + simplejson + [testenv:py31] deps=https://bitbucket.org/jpellerin/nose3/get/tip.zip From 9314b385aefa4d73a783599f74d562c95152a6e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Neuh=C3=A4user?= Date: Sat, 8 Jan 2011 21:50:41 +0100 Subject: [PATCH 2/2] Added pypy testenv --- tox.ini | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 0d41f0395..01d12ee6e 100644 --- a/tox.ini +++ b/tox.ini @@ -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 @@ -20,6 +20,11 @@ deps= [testenv:py31] deps=https://bitbucket.org/jpellerin/nose3/get/tip.zip +[testenv:pypy] +deps= + nose + simplejson + [testenv:du05] deps= nose