From 7b639c0cd0676172cc8502e833f5b708f39f9a83 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 9 Feb 2015 17:57:08 +0000
Subject: [PATCH] Drop django master from the build matrix.

Currently always going to be a know failure case.
We can add it back when we start to consdier Django 1.9 support.
---
 .travis.yml | 12 ------------
 tox.ini     |  3 +--
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 28ebfc00f..4f9297853 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,18 +25,6 @@ env:
     - TOX_ENV=py33-django18alpha
     - TOX_ENV=py32-django18alpha
     - TOX_ENV=py27-django18alpha
-    - TOX_ENV=py34-djangomaster
-    - TOX_ENV=py33-djangomaster
-    - TOX_ENV=py32-djangomaster
-    - TOX_ENV=py27-djangomaster
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - env: TOX_ENV=py34-djangomaster
-    - env: TOX_ENV=py33-djangomaster
-    - env: TOX_ENV=py32-djangomaster
-    - env: TOX_ENV=py27-djangomaster
 
 install:
   - pip install tox
diff --git a/tox.ini b/tox.ini
index 8e0369643..eda92c19b 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,18alpha,master}
+       {py27,py32,py33,py34}-django{17,18alpha}
 
 [testenv]
 commands = ./runtests.py --fast
@@ -15,7 +15,6 @@ deps =
        django16: Django==1.6.3  # Should track minimum supported
        django17: Django==1.7.2  # Should track maximum supported
        django18alpha: https://www.djangoproject.com/download/1.8a1/tarball/
-       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