aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorJosé Padilla2015-04-04 22:07:11 -0400
committerJosé Padilla2015-04-04 22:07:11 -0400
commit7228a0df75128cc2f46008199142eb25d7c183c8 (patch)
tree368866285d05d18003512a8df2c27bb018ceafa1 /.travis.yml
parent2e6d39dbae3330cef31d68dedd37398e364ee83c (diff)
downloaddjango-rest-framework-7228a0df75128cc2f46008199142eb25d7c183c8.tar.bz2
Test against Django's master branch
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml11
1 files changed, 11 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 71cec7be..2134a144 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,18 @@ env:
- TOX_ENV=py26-django15
- TOX_ENV=py27-django14
- TOX_ENV=py26-django14
+ - TOX_ENV=py27-djangomaster
+ - TOX_ENV=py32-djangomaster
+ - TOX_ENV=py33-djangomaster
+ - TOX_ENV=py34-djangomaster
+matrix:
+ fast_finish: true
+ allow_failures:
+ - env: TOX_ENV=py27-djangomaster
+ - env: TOX_ENV=py32-djangomaster
+ - env: TOX_ENV=py33-djangomaster
+ - env: TOX_ENV=py34-djangomaster
install:
- pip install tox