tests: update tox/Travis Djagno versions

.travis.yml

@@ -7,7 +7,8 @@ python:
 env:
   - DJANGO=django==1.4.5
   - DJANGO=django==1.5
-  - DJANGO=https://github.com/django/django/archive/stable/1.6.x.zip
+  - DJANGO=django==1.6
+  #- DJANGO=https://github.com/django/django/archive/stable/1.6.x.zip
 
 matrix:
   exclude:

tox.ini

@@ -1,12 +1,19 @@
 [tox]
 envlist=
     py33-django-dev,
+
+    py33-django16,
+    py32-django16,
+    py27-django16,
+    py26-django16,
+
     py33-django15,
     py32-django15,
-    py26-django15,
     py27-django15,
-    py26-django14,
+    py26-django15,
+
     py27-django14,
+    py26-django14,
     docs,
 
 [testenv]
@@ -15,25 +22,33 @@ commands=
 
 # Build configurations
 
-[testenv:py26-django15]
-basepython=python2.6
-deps=
-    django==1.5
 
-[testenv:py27-django15]
+[testenv:py33-django-dev]
+basepython=python3.3
+deps=
+    https://github.com/django/django/archive/master.zip
+
+
+[testenv:py33-django16]
+basepython=python3.3
+deps=
+    django==1.6
+
+[testenv:py32-django16]
+basepython=python3.2
+deps=
+    django==1.6
+
+[testenv:py27-django16]
 basepython=python2.7
 deps=
-    django==1.5
+    django==1.6
 
-[testenv:py26-django14]
+[testenv:py26-django16]
 basepython=python2.6
 deps=
-    django==1.4.5
+    django==1.6
 
-[testenv:py27-django14]
-basepython=python2.7
-deps=
-    django==1.4.5
 
 [testenv:py33-django15]
 basepython=python3.3
@@ -45,10 +60,26 @@ basepython=python3.2
 deps=
     django==1.5
 
-[testenv:py33-django-dev]
-basepython=python3.3
+[testenv:py27-django15]
+basepython=python2.7
 deps=
-    https://github.com/django/django/archive/master.zip
+    django==1.5
+
+[testenv:py26-django15]
+basepython=python2.6
+deps=
+    django==1.5
+
+
+[testenv:py26-django14]
+basepython=python2.6
+deps=
+    django==1.4.5
+
+[testenv:py27-django14]
+basepython=python2.7
+deps=
+    django==1.4.5
 
 [testenv:docs]
 changedir=docs