aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortom christie tom@tomchristie.com2011-04-26 20:40:39 +0100
committertom christie tom@tomchristie.com2011-04-26 20:40:39 +0100
commitda7d49a3846904b90a320d67135c04e1487d3097 (patch)
tree78bf45ca89d90bddb11d4830b8c25c2274df7e45
parentbdf4fef8b61a3c4986dda1aa074ec5f9cc33bc47 (diff)
downloaddjango-rest-framework-da7d49a3846904b90a320d67135c04e1487d3097.tar.bz2
tox can now use django 1.3 rather than 1.3-rc1. Huzzah.
-rw-r--r--tox.ini14
1 files changed, 6 insertions, 8 deletions
diff --git a/tox.ini b/tox.ini
index 776b13ba..27c8e806 100644
--- a/tox.ini
+++ b/tox.ini
@@ -47,21 +47,21 @@ deps=
[testenv:py25-django13]
basepython=python2.5
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: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
@@ -73,7 +73,6 @@ commands=
python examples/runtests.py
deps=
django==1.2.4
- simplejson
coverage==3.4
wsgiref==0.1.2
Pygments==1.4
@@ -112,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
@@ -126,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
@@ -139,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