Merge branch 'version-3.1' into oauth_as_package

Conflicts:
	requirements-test.txt
	rest_framework/compat.py
	tests/settings.py
	tox.ini

1 files changed, 24 insertions, 142 deletions

diff --git a/tox.ini b/tox.ini
index a502af97..388eabc5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,152 +1,34 @@
 [tox]
-downloadcache = {toxworkdir}/cache/
 envlist =
-       flake8,
-       py3.4-django1.7,py3.3-django1.7,py3.2-django1.7,py2.7-django1.7,
-       py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,
-       py3.4-django1.5,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,
-       py2.7-django1.4,py2.6-django1.4
+       py27-flake8,
+       {py26,py27}-django14,
+       {py26,py27,py32,py33,py34}-django{15,16},
+       {py27,py32,py33,py34}-django{17,master}
 
 [testenv]
 commands = ./runtests.py --fast
-
-[testenv:flake8]
-basepython = python2.7
-deps = pytest==2.5.2
-       flake8==2.2.2
-commands = ./runtests.py --lintonly
-
-[testenv:py3.4-django1.7]
-basepython = python3.4
-deps = Django==1.7
-       django-filter==0.7
-       defusedxml==0.3
-       Pillow==2.3.0
-       pytest-django==2.6.1
-
-[testenv:py3.3-django1.7]
-basepython = python3.3
-deps = Django==1.7
-       django-filter==0.7
-       defusedxml==0.3
-       Pillow==2.3.0
-       pytest-django==2.6.1
-
-[testenv:py3.2-django1.7]
-basepython = python3.2
-deps = Django==1.7
-       django-filter==0.7
-       defusedxml==0.3
-       Pillow==2.3.0
-       pytest-django==2.6.1
-
-[testenv:py2.7-django1.7]
-basepython = python2.7
-deps = Django==1.7
-       django-filter==0.7
-       defusedxml==0.3
-       django-guardian==1.2.3
-       Pillow==2.3.0
-       pytest-django==2.6.1
-
-[testenv:py3.4-django1.6]
-basepython = python3.4
-deps = Django==1.6.3
-       django-filter==0.7
-       defusedxml==0.3
-       Pillow==2.3.0
-       pytest-django==2.6.1
-
-[testenv:py3.3-django1.6]
-basepython = python3.3
-deps = Django==1.6.3
-       django-filter==0.7
-       defusedxml==0.3
-       Pillow==2.3.0
-       pytest-django==2.6.1
-
-[testenv:py3.2-django1.6]
-basepython = python3.2
-deps = Django==1.6.3
-       django-filter==0.7
-       defusedxml==0.3
-       Pillow==2.3.0
-       pytest-django==2.6.1
-
-[testenv:py2.7-django1.6]
-basepython = python2.7
-deps = Django==1.6.3
-       django-filter==0.7
-       defusedxml==0.3
-       django-guardian==1.2.3
-       Pillow==2.3.0
-       pytest-django==2.6.1
-
-[testenv:py2.6-django1.6]
-basepython = python2.6
-deps = Django==1.6.3
-       django-filter==0.7
-       defusedxml==0.3
-       django-guardian==1.2.3
-       Pillow==2.3.0
-       pytest-django==2.6.1
-
-[testenv:py3.4-django1.5]
-basepython = python3.4
-deps = django==1.5.6
-       django-filter==0.7
-       defusedxml==0.3
-       Pillow==2.3.0
-       pytest-django==2.6.1
-
-[testenv:py3.3-django1.5]
-basepython = python3.3
-deps = django==1.5.6
-       django-filter==0.7
-       defusedxml==0.3
-       Pillow==2.3.0
-       pytest-django==2.6.1
-
-[testenv:py3.2-django1.5]
-basepython = python3.2
-deps = django==1.5.6
-       django-filter==0.7
-       defusedxml==0.3
-       Pillow==2.3.0
-       pytest-django==2.6.1
-
-[testenv:py2.7-django1.5]
-basepython = python2.7
-deps = django==1.5.6
-       django-filter==0.7
-       defusedxml==0.3
-       django-guardian==1.2.3
-       Pillow==2.3.0
+setenv =
+       PYTHONDONTWRITEBYTECODE=1
+deps =
+       django14: Django==1.4.16
+       django15: Django==1.5.11
+       django16: Django==1.6.8
+       django17: Django==1.7.1
+       djangomaster: https://github.com/django/django/zipball/master
+       {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3
        pytest-django==2.6.1
-
-[testenv:py2.6-django1.5]
-basepython = python2.6
-deps = django==1.5.6
        django-filter==0.7
        defusedxml==0.3
-       django-guardian==1.2.3
-       Pillow==2.3.0
-       pytest-django==2.6.1
+       markdown>=2.1.0
+       PyYAML>=3.10
 
-[testenv:py2.7-django1.4]
-basepython = python2.7
-deps = django==1.4.11
-       django-filter==0.7
-       defusedxml==0.3
-       django-guardian==1.2.3
-       Pillow==2.3.0
-       pytest-django==2.6.1
+[testenv:py27-flake8]
+deps =
+       pytest==2.5.2
+       flake8==2.2.2
+commands = ./runtests.py --lintonly
 
-[testenv:py2.6-django1.4]
-basepython = python2.6
-deps = django==1.4.11
-       django-filter==0.7
-       defusedxml==0.3
-       django-guardian==1.2.3
-       Pillow==2.3.0
-       pytest-django==2.6.1
+[testenv:py27-docs]
+deps =
+       mkdocs>=0.11.1
+commands = mkdocs build