aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTymur Maryokhin2014-12-04 00:03:08 +0100
committerTymur Maryokhin2014-12-04 00:03:08 +0100
commitf8fdfe5a9379bd72066f7ac3a05198271a74088a (patch)
treefe524c6a0ff402a238855fe7e50227b2f97c68db
parent5f2f54b7fb52e35e3f47a677c2c5b9981c7d1f81 (diff)
downloaddjango-rest-framework-f8fdfe5a9379bd72066f7ac3a05198271a74088a.tar.bz2
Updated Django versions to match requirements
-rw-r--r--tox.ini6
1 files changed, 3 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini
index d5cb9ef9..933ee560 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
- py27-flake8,
+ py27-{flake8,docs},
{py26,py27}-django14,
{py26,py27,py32,py33,py34}-django{15,16},
{py27,py32,py33,py34}-django{17,master}
@@ -10,8 +10,8 @@ commands = ./runtests.py --fast
setenv =
PYTHONDONTWRITEBYTECODE=1
deps =
- django14: Django==1.4.16
- django15: Django==1.5.11
+ django14: Django==1.4.11
+ django15: Django==1.5.5
django16: Django==1.6.8
django17: Django==1.7.1
djangomaster: https://github.com/django/django/zipball/master