From 3712f67c856f99468d10f618bae059605831a5f3 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Wed, 10 Sep 2014 10:15:53 +0300
Subject: [PATCH 1/3] Unpinning the Django dependency to use the latest patch
 version.

---
 tox.ini | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tox.ini b/tox.ini
index d40a70799..b5382d677 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ commands = ./runtests.py --lintonly
 
 [testenv:py3.4-django1.7]
 basepython = python3.4
-deps = Django==1.7
+deps = Django>=1.7.0,<1.8.0
        django-filter==0.7
        defusedxml==0.3
        Pillow==2.3.0
@@ -26,7 +26,7 @@ deps = Django==1.7
 
 [testenv:py3.3-django1.7]
 basepython = python3.3
-deps = Django==1.7
+deps = Django>=1.7.0,<1.8.0
        django-filter==0.7
        defusedxml==0.3
        Pillow==2.3.0
@@ -34,7 +34,7 @@ deps = Django==1.7
 
 [testenv:py3.2-django1.7]
 basepython = python3.2
-deps = Django==1.7
+deps = Django>=1.7.0,<1.8.0
        django-filter==0.7
        defusedxml==0.3
        Pillow==2.3.0
@@ -42,7 +42,7 @@ deps = Django==1.7
 
 [testenv:py2.7-django1.7]
 basepython = python2.7
-deps = Django==1.7
+deps = Django>=1.7.0,<1.8.0
        django-filter==0.7
        defusedxml==0.3
        # django-oauth-plus==2.2.1
@@ -54,7 +54,7 @@ deps = Django==1.7
 
 [testenv:py3.4-django1.6]
 basepython = python3.4
-deps = Django==1.6.3
+deps = Django>=1.6.0,<1.7.0
        django-filter==0.7
        defusedxml==0.3
        Pillow==2.3.0
@@ -62,7 +62,7 @@ deps = Django==1.6.3
 
 [testenv:py3.3-django1.6]
 basepython = python3.3
-deps = Django==1.6.3
+deps = Django>=1.6.0,<1.7.0
        django-filter==0.7
        defusedxml==0.3
        Pillow==2.3.0
@@ -70,7 +70,7 @@ deps = Django==1.6.3
 
 [testenv:py3.2-django1.6]
 basepython = python3.2
-deps = Django==1.6.3
+deps = Django>=1.6.0,<1.7.0
        django-filter==0.7
        defusedxml==0.3
        Pillow==2.3.0
@@ -78,7 +78,7 @@ deps = Django==1.6.3
 
 [testenv:py2.7-django1.6]
 basepython = python2.7
-deps = Django==1.6.3
+deps = Django>=1.6.0,<1.7.0
        django-filter==0.7
        defusedxml==0.3
        django-oauth-plus==2.2.1
@@ -90,7 +90,7 @@ deps = Django==1.6.3
 
 [testenv:py2.6-django1.6]
 basepython = python2.6
-deps = Django==1.6.3
+deps = Django>=1.6.0,<1.7.0
        django-filter==0.7
        defusedxml==0.3
        django-oauth-plus==2.2.1
@@ -102,7 +102,7 @@ deps = Django==1.6.3
 
 [testenv:py3.4-django1.5]
 basepython = python3.4
-deps = django==1.5.6
+deps = Django>=1.5.0,<1.6.0
        django-filter==0.7
        defusedxml==0.3
        Pillow==2.3.0
@@ -110,7 +110,7 @@ deps = django==1.5.6
 
 [testenv:py3.3-django1.5]
 basepython = python3.3
-deps = django==1.5.6
+deps = Django>=1.5.0,<1.6.0
        django-filter==0.7
        defusedxml==0.3
        Pillow==2.3.0
@@ -118,7 +118,7 @@ deps = django==1.5.6
 
 [testenv:py3.2-django1.5]
 basepython = python3.2
-deps = django==1.5.6
+deps = Django>=1.5.0,<1.6.0
        django-filter==0.7
        defusedxml==0.3
        Pillow==2.3.0
@@ -126,7 +126,7 @@ deps = django==1.5.6
 
 [testenv:py2.7-django1.5]
 basepython = python2.7
-deps = django==1.5.6
+deps = Django>=1.5.0,<1.6.0
        django-filter==0.7
        defusedxml==0.3
        django-oauth-plus==2.2.1
@@ -138,7 +138,7 @@ deps = django==1.5.6
 
 [testenv:py2.6-django1.5]
 basepython = python2.6
-deps = django==1.5.6
+deps = Django>=1.5.0,<1.6.0
        django-filter==0.7
        defusedxml==0.3
        django-oauth-plus==2.2.1
@@ -150,7 +150,7 @@ deps = django==1.5.6
 
 [testenv:py2.7-django1.4]
 basepython = python2.7
-deps = django==1.4.11
+deps = Django>=1.4.0,<1.5.0
        django-filter==0.7
        defusedxml==0.3
        django-oauth-plus==2.2.1
@@ -162,7 +162,7 @@ deps = django==1.4.11
 
 [testenv:py2.6-django1.4]
 basepython = python2.6
-deps = django==1.4.11
+deps = Django>=1.4.0,<1.5.0
        django-filter==0.7
        defusedxml==0.3
        django-oauth-plus==2.2.1

From 48103323def9ad768ff5dfd9aa9846d34479a1ce Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Wed, 10 Sep 2014 10:18:50 +0300
Subject: [PATCH 2/3] Large matrixes should fast finish.

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a5b6d7d91..1cdc41a90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,3 +26,6 @@ install:
 
 script:
     - tox -e $TOX_ENV
+    
+matrix:
+    fast_finish: true

From 58c121d6e4ac065dc2aed2ab68131e608328b252 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Wed, 10 Sep 2014 10:19:57 +0300
Subject: [PATCH 3/3] Retrying pip install will cause the build to fail less
 due to network errors.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1cdc41a90..9b7217ae4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ env:
     - TOX_ENV=py2.6-django1.4
 
 install:
-  - "pip install tox --download-cache $HOME/.pip-cache"
+  - "travis_retry pip install tox --download-cache $HOME/.pip-cache"
 
 script:
     - tox -e $TOX_ENV