Test on Django 1.4 to 1.6

Author: noirbizarre

.travis.yml

@@ -6,7 +6,8 @@ python:
   - 3.3
 env:
     - DJANGO='django>=1.4,<1.5'
-    - DJANGO='django>=1.5'
+    - DJANGO='django>=1.5,<1.6'
+    - DJANGO='django>=1.6'
 matrix:
     exclude:
         -   python: 3.2

tox.ini

@@ -4,12 +4,16 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py32, py33, py26-django-1.4, py27-django-1.4, doc
+envlist = py26, py27, py32, py33, py26-django-1.4, py27-django-1.4, py26-django-1.5, py27-django-1.5, py32-django-1.5, py33-django-1.5, doc
 
 [testenv]
 commands = {envpython} manage.py test djangojs
 deps =
-    django>=1.5
+    django>=1.6
+
+[django-1.5]
+deps =
+    django>=1.5,<1.6
 
 [django-1.4]
 deps =
@@ -23,6 +27,22 @@ deps = {[django-1.4]deps}
 basepython = python2.7
 deps = {[django-1.4]deps}
 
+[testenv:py26-django-1.5]
+basepython = python2.6
+deps = {[django-1.5]deps}
+
+[testenv:py27-django-1.5]
+basepython = python2.7
+deps = {[django-1.5]deps}
+
+[testenv:py32-django-1.5]
+basepython = python3.2
+deps = {[django-1.5]deps}
+
+[testenv:py33-django-1.5]
+basepython = python3.3
+deps = {[django-1.5]deps}
+
 [testenv:doc]
 changedir = doc
 deps =