aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorTom Christie2014-11-17 09:56:20 +0000
committerTom Christie2014-11-17 09:56:20 +0000
commitb001a146d73348af18cfc4c943d87f2f389349c9 (patch)
tree2240bc3427c77227181fba6fd9f22a10163c230c /.travis.yml
parent4e035184384db8ed1227fdcb1dad2ea6ddb1cf68 (diff)
downloaddjango-rest-framework-b001a146d73348af18cfc4c943d87f2f389349c9.tar.bz2
Add django master to build matrix. Closes #2075.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml10
1 files changed, 10 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index a5b6d7d9..4c06acf5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,16 @@ env:
- TOX_ENV=py2.6-django1.5
- TOX_ENV=py2.7-django1.4
- TOX_ENV=py2.6-django1.4
+ - TOX_ENV=py3.4-djangomaster
+ - TOX_ENV=py3.3-djangomaster
+ - TOX_ENV=py2.7-djangomaster
+
+matrix:
+ fast_finish: true
+ allow_failures:
+ - env: TOX_ENV=py3.4-djangomaster
+ - env: TOX_ENV=py3.3-djangomaster
+ - env: TOX_ENV=py2.7-djangomaster
install:
- "pip install tox --download-cache $HOME/.pip-cache"