Merge lp:~canonical-isd-hackers/django-preflight/update-tox into lp:django-preflight

[Łukasz Czyżykowski]

Updated version of Django 1.3, now that it's released.

Overview
========
Updated version of Django 1.3, now that it's released.

[Michael Foord (mfoord)]

Cool.

review: Approve

[ISD Branch Mangler (isd-branches-mangler)]

Attempt to merge into lp:django-preflight failed due to conflicts:

text conflict in tox.ini

[lp:~canonical-isd-hackers/django-preflight/update-tox]

11. By Łukasz Czyżykowski on 2011-04-06

Merged from trunk.

=== modified file 'tox.ini'
--- tox.ini	2011-03-19 15:05:28 +0000
+++ tox.ini	2011-04-06 14:11:01 +0000
@@ -1,8 +1,8 @@
 [tox]
 envlist = 
-        py2.5-django1.2, py2.5-django1.1, py2.5-django1.0, py2.5-django1.3-rc-1,
-        py2.6-django1.2, py2.6-django1.1, py2.6-django1.0, py2.6-django1.3-rc-1,
-        py2.7-django1.2, py2.7-django1.1, py2.7-django1.0, py2.7-django1.3-rc-1,
+        py2.5-django1.2, py2.5-django1.1, py2.5-django1.0, py2.5-django1.3,
+        py2.6-django1.2, py2.6-django1.1, py2.6-django1.0, py2.6-django1.3,
+        py2.7-django1.2, py2.7-django1.1, py2.7-django1.0, py2.7-django1.3,
         docs
 
 [testenv]
@@ -29,9 +29,9 @@
 basetpython = python2.5
 deps = django >= 1.0, < 1.1
 
-[testenv:py2.5-django1.3-rc-1]
+[testenv:py2.5-django1.3]
 basepython = python2.5
-deps = http://www.djangoproject.com/download/1.3-rc-1/tarball/
+deps = django >= 1.3, < 1.4
 
 # Python 2.6
 [testenv:py2.6-django1.2]
@@ -46,9 +46,9 @@
 basetpython = python2.6
 deps = django >= 1.0, < 1.1
 
-[testenv:py2.6-django1.3-rc-1]
+[testenv:py2.6-django1.3]
 basepython = python2.6
-deps = http://www.djangoproject.com/download/1.3-rc-1/tarball/
+deps = django >= 1.3, < 1.4
 
 # Python 2.7
 [testenv:py2.7-django1.2]
@@ -63,7 +63,7 @@
 basetpython = python2.7
 deps = django >= 1.0, < 1.1
 
-[testenv:py2.7-django1.3-rc-1]
+[testenv:py2.7-django1.3]
 basepython = python2.7
-deps = http://www.djangoproject.com/download/1.3-rc-1/tarball/
+deps = django >= 1.3, < 1.4