Commits

Georg Brandl committed cd7b0a8 Merge

merge heads

  • Participants
  • Parent commits 82b872f, 124180a

Comments (0)

Files changed (1)

 [tox]
-envlist=py24,py25,py26,py27,py31,du07,du06,du05
+envlist=py24,py25,py26,py27,py31,pypy,du07,du06,du05
 
 [testenv]
 deps=nose
     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