Resolve merge conflictmodel-serializer-caching

1 files changed, 9 insertions, 9 deletions

diff --git a/tox.ini b/tox.ini
index 9fb8586c..129752f3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,27 +3,27 @@ envlist =
        py27-{flake8,docs},
        {py26,py27}-django14,
        {py26,py27,py32,py33,py34}-django{15,16},
-       {py27,py32,py33,py34}-django17,
-       {py27,py32,py33,py34}-djangomaster
+       {py27,py32,py33,py34}-django{17,18alpha,master}
 
 [testenv]
 commands = ./runtests.py --fast
 setenv =
        PYTHONDONTWRITEBYTECODE=1
 deps =
-       django14: Django==1.4.11
-       django15: Django==1.5.5
-       django16: Django==1.6.8
-       django17: Django==1.7.1
+       django14: Django==1.4.11  # Should track minimum supported
+       django15: Django==1.5.6  # Should track minimum supported
+       django16: Django==1.6.3  # Should track minimum supported
+       django17: Django==1.7.2  # Should track maximum supported
+       django18alpha: https://www.djangoproject.com/download/1.8a1/tarball/
        djangomaster: https://github.com/django/django/zipball/master
        django-guardian==1.2.4
-       pytest-django==2.6.1
-       django-filter==0.9.1
+       pytest-django==2.8.0
+       django-filter==0.9.2
        markdown>=2.1.0
 
 [testenv:py27-flake8]
 deps =
-       pytest==2.5.2
+       pytest==2.6.4
        flake8==2.2.2
 commands = ./runtests.py --lintonly