aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorJosé Padilla2015-04-04 22:07:11 -0400
committerJosé Padilla2015-04-04 22:07:11 -0400
commit7228a0df75128cc2f46008199142eb25d7c183c8 (patch)
tree368866285d05d18003512a8df2c27bb018ceafa1 /tox.ini
parent2e6d39dbae3330cef31d68dedd37398e364ee83c (diff)
downloaddjango-rest-framework-7228a0df75128cc2f46008199142eb25d7c183c8.tar.bz2
Test against Django's master branch
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini3
1 files changed, 2 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index befef744..ea111816 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist =
py27-{flake8,docs},
{py26,py27}-django14,
{py26,py27,py32,py33,py34}-django{15,16},
- {py27,py32,py33,py34}-django{17,18}
+ {py27,py32,py33,py34}-django{17,18,master}
[testenv]
commands = ./runtests.py --fast
@@ -15,6 +15,7 @@ deps =
django16: Django==1.6.3 # Should track minimum supported
django17: Django==1.7.2 # Should track maximum supported
django18: Django==1.8 # Should track maximum supported
+ djangomaster: https://github.com/django/django/zipball/master
-rrequirements/requirements-testing.txt
-rrequirements/requirements-optionals.txt