aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorTom Christie2014-11-17 09:56:20 +0000
committerTom Christie2014-11-17 09:56:20 +0000
commitb001a146d73348af18cfc4c943d87f2f389349c9 (patch)
tree2240bc3427c77227181fba6fd9f22a10163c230c /tox.ini
parent4e035184384db8ed1227fdcb1dad2ea6ddb1cf68 (diff)
downloaddjango-rest-framework-b001a146d73348af18cfc4c943d87f2f389349c9.tar.bz2
Add django master to build matrix. Closes #2075.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini24
1 files changed, 23 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index d52dd155..493712a1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,8 @@ envlist =
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
+ py2.7-django1.4,py2.6-django1.4,
+ py3.4-djangomaster,py3.3-djangomaster,py2.7-djangomaster
[testenv]
commands = ./runtests.py --fast
@@ -157,3 +158,24 @@ deps = django==1.4.11
django-oauth2-provider==0.2.3
django-guardian==1.2.3
pytest-django==2.6.1
+
+[testenv:py3.4-djangomaster]
+basepython = python3.4
+deps = https://github.com/django/django/zipball/master
+ django-filter==0.7
+ defusedxml==0.3
+ pytest-django==2.6.1
+
+[testenv:py3.3-djangomaster]
+basepython = python3.3
+deps = https://github.com/django/django/zipball/master
+ django-filter==0.7
+ defusedxml==0.3
+ pytest-django==2.6.1
+
+[testenv:py2.7-djangomaster]
+basepython = python3.2
+deps = https://github.com/django/django/zipball/master
+ django-filter==0.7
+ defusedxml==0.3
+ pytest-django==2.6.1