aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini13
1 files changed, 4 insertions, 9 deletions
diff --git a/tox.ini b/tox.ini
index 933ee560..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,16 +16,10 @@ 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
- {py26,py27}-django{14,15,16}: oauth2==1.5.211
- {py26,py27}-django{14,15,16}: django-oauth-plus==2.2.1
- {py26,py27}-django{14,15}: django-oauth2-provider==0.2.3
- {py26,py27}-django16: django-oauth2-provider==0.2.4
+ 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
- PyYAML>=3.10
[testenv:py27-flake8]
deps =