Test for Django v1.6 compatibility

.travis.yml

@@ -1,16 +1,20 @@
 language: python
 python:
+  - 2.6
+  - 2.7
+install:
 - '2.6'
 - '2.7'
 env:
   global:
     # $TRANSIFEX_PASSWORD for oscar_bot (used in transifex.sh)
     secure: FuIlzEsGJiAwhaIRBmRNsq9eXmuzs25fX6BChknW4lDyVAySWMp0+Zps9Bd0JgfFYUG3Ip+OTmksYIoTUsG25ZJS9cq1IFt3QKUAN70YCI/4ZBLeIdICPEyxq+Km179+NeEXmBUug17RLMLxh3MWfO+RKUHK9yHIPNNpq0dNyoo=
   matrix:
-  - DJANGO_VERSION=1.4.8
-  - DJANGO_VERSION=1.5.4
+  - DJANGO_VERSION=Django==1.4.8
+  - DJANGO_VERSION=Django==1.5.4
+  - DJANGO_VERSION=http://github.com/django/django/tarball/stable/1.6.x
 install:
-- easy_install Django==$DJANGO_VERSION
+- easy_install $DJANGO_VERSION
 script:
 - make travis
 after_success:

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26-1.4, py27-1.4, py26-1.5, py27-1.5
+envlist = py26-1.4, py27-1.4, py26-1.5, py27-1.5, py26-1.6, py27-1.6
 
 [testenv]
 commands = python runtests.py []
@@ -28,3 +28,13 @@ deps = -r{toxinidir}/requirements.txt
 basepython = python2.7
 deps = -r{toxinidir}/requirements.txt
        django==1.5.4
+
+[testenv:py26-1.6]
+basepython = python2.6
+deps = -r{toxinidir}/requirements.txt
+       https://www.djangoproject.com/download/1.6c1/tarball/
+
+[testenv:py27-1.6]
+basepython = python2.7
+deps = -r{toxinidir}/requirements.txt
+       https://www.djangoproject.com/download/1.6c1/tarball/