diff options
| author | Tom Christie | 2011-04-27 18:20:29 +0100 |
|---|---|---|
| committer | Tom Christie | 2011-04-27 18:20:29 +0100 |
| commit | da60f68f50dbcc177cb8b31df428d2daa905e9c6 (patch) | |
| tree | 6393597cdf4b6b0cc84f5ce792d3770d011aa189 /tox.ini | |
| parent | 659898ffaf24f74b62e73c487cd81bad21904790 (diff) | |
| parent | b508ca38d44f458e3eabaa4ffd3500d80a71eb9e (diff) | |
| download | django-rest-framework-da60f68f50dbcc177cb8b31df428d2daa905e9c6.tar.bz2 | |
Merge previous checkins
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 16 |
1 files changed, 6 insertions, 10 deletions
@@ -27,7 +27,6 @@ commands= basepython=python2.5 deps= django==1.2.4 - simplejson coverage==3.4 https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip @@ -48,22 +47,21 @@ deps= [testenv:py25-django13] basepython=python2.5 deps= - http://www.djangoproject.com/download/1.3-rc-1/tarball/ - simplejson + django==1.3 coverage==3.4 https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip [testenv:py26-django13] basepython=python2.6 deps= - http://www.djangoproject.com/download/1.3-rc-1/tarball/ + django==1.3 coverage==3.4 https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip [testenv:py27-django13] basepython=python2.7 deps= - http://www.djangoproject.com/download/1.3-rc-1/tarball/ + django==1.3 coverage==3.4 https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip @@ -75,7 +73,6 @@ commands= python examples/runtests.py deps= django==1.2.4 - simplejson coverage==3.4 wsgiref==0.1.2 Pygments==1.4 @@ -114,8 +111,7 @@ basepython=python2.5 commands= python examples/runtests.py deps= - http://www.djangoproject.com/download/1.3-rc-1/tarball/ - simplejson + django==1.3 coverage==3.4 wsgiref==0.1.2 Pygments==1.4 @@ -128,7 +124,7 @@ basepython=python2.6 commands= python examples/runtests.py deps= - http://www.djangoproject.com/download/1.3-rc-1/tarball/ + django==1.3 coverage==3.4 wsgiref==0.1.2 Pygments==1.4 @@ -141,7 +137,7 @@ basepython=python2.7 commands= python examples/runtests.py deps= - http://www.djangoproject.com/download/1.3-rc-1/tarball/ + django==1.3 coverage==3.4 wsgiref==0.1.2 Pygments==1.4 |