aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorTom Christie2014-12-12 15:59:11 +0000
committerTom Christie2014-12-12 15:59:11 +0000
commit26131a7aea39bb517393b3b6774372d6aebd6885 (patch)
treee99100c729523177841cd0904b37a60109a54cb2 /tox.ini
parentbaaa356489dd51d7c68161db40e99cd59b1124c3 (diff)
downloaddjango-rest-framework-26131a7aea39bb517393b3b6774372d6aebd6885.tar.bz2
Fix dependancies
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini8
1 files changed, 4 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index f129ff3a..9fb8586c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,8 @@ envlist =
py27-{flake8,docs},
{py26,py27}-django14,
{py26,py27,py32,py33,py34}-django{15,16},
- {py27,py32,py33,py34}-django{17,master}
+ {py27,py32,py33,py34}-django17,
+ {py27,py32,py33,py34}-djangomaster
[testenv]
commands = ./runtests.py --fast
@@ -15,10 +16,9 @@ deps =
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
+ django-guardian==1.2.4
pytest-django==2.6.1
- django-filter==0.7
- defusedxml==0.3
+ django-filter==0.9.1
markdown>=2.1.0
[testenv:py27-flake8]