Add Django 1.6 to docs and to tox

README.md

@@ -27,7 +27,7 @@ There is a live example API for testing purposes, [available here][sandbox].
 # Requirements
 
 * Python (2.6.5+, 2.7, 3.2, 3.3)
-* Django (1.3, 1.4, 1.5)
+* Django (1.3, 1.4, 1.5, 1.6)
 
 # Installation
 

docs/index.md

@@ -32,7 +32,7 @@ There is a live example API for testing purposes, [available here][sandbox].
 REST framework requires the following:
 
 * Python (2.6.5+, 2.7, 3.2, 3.3)
-* Django (1.3, 1.4, 1.5)
+* Django (1.3, 1.4, 1.5, 1.6)
 
 The following packages are optional:
 

tox.ini

 [tox]
 downloadcache = {toxworkdir}/cache/
-envlist = py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,py2.7-django1.4,py2.6-django1.4,py2.7-django1.3,py2.6-django1.3
+envlist = py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,py2.7-django1.4,py2.6-django1.4,py2.7-django1.3,py2.6-django1.3
 
 [testenv]
 commands = {envpython} rest_framework/runtests/runtests.py
 
+[testenv:py3.3-django1.6]
+basepython = python3.3
+deps = https://www.djangoproject.com/download/1.6a1/tarball/
+       django-filter==0.6a1
+       defusedxml==0.3
+
+[testenv:py3.2-django1.6]
+basepython = python3.2
+deps = https://www.djangoproject.com/download/1.6a1/tarball/
+       django-filter==0.6a1
+       defusedxml==0.3
+
+[testenv:py2.7-django1.6]
+basepython = python2.7
+deps = https://www.djangoproject.com/download/1.6a1/tarball/
+       django-filter==0.6a1
+       defusedxml==0.3
+       django-oauth-plus==2.0
+       oauth2==1.5.211
+       django-oauth2-provider==0.2.3
+
+[testenv:py2.6-django1.6]
+basepython = python2.6
+deps = https://www.djangoproject.com/download/1.6a1/tarball/
+       django-filter==0.6a1
+       defusedxml==0.3
+       django-oauth-plus==2.0
+       oauth2==1.5.211
+       django-oauth2-provider==0.2.3
+
 [testenv:py3.3-django1.5]
 basepython = python3.3
 deps = django==1.5