encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-03 05:04:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add Django 1.6 to docs and to tox

Browse Source
This commit is contained in:
Tom Christie 2013-06-02 21:14:02 +01:00
parent 1bb5fb8e4a
commit b10869a08b
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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

2
docs/index.md
View File

@ -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:

32
tox.ini
View File

@ -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