diff options
| author | Tom Christie | 2013-06-02 21:14:02 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-06-02 21:14:02 +0100 |
| commit | b10869a08b4effac9b8df1d776e6ffb882a1a742 (patch) | |
| tree | 0aee5e025fe8e72e66935260a7cc347f8e9f5fb9 | |
| parent | 1bb5fb8e4a88375f7f51d20175515bfa6e926f3c (diff) | |
| download | django-rest-framework-b10869a08b4effac9b8df1d776e6ffb882a1a742.tar.bz2 | |
Add Django 1.6 to docs and to tox
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | docs/index.md | 2 | ||||
| -rw-r--r-- | tox.ini | 32 |
3 files changed, 33 insertions, 3 deletions
@@ -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 diff --git a/docs/index.md b/docs/index.md index 78259a00..d944ddd4 100644 --- a/docs/index.md +++ b/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: @@ -1,10 +1,40 @@ [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 |