From c61d311acbe20807e1d24e22fdac83c6301b5add Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Thu, 13 Feb 2014 12:34:50 +0100
Subject: Use 1.7a2 for django 1.7 line and added django-guardian PR for python
 3.x or django 1.7 tests.

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

diff --git a/.travis.yml b/.travis.yml
index 001534b2..01955e7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ python:
   - "3.3"
 
 env:
-  - DJANGO="https://www.djangoproject.com/download/1.7a1/tarball/"
+  - DJANGO="https://www.djangoproject.com/download/1.7a2/tarball/"
   - DJANGO="django==1.6"
   - DJANGO="django==1.5.5"
   - DJANGO="django==1.4.10"
@@ -22,6 +22,8 @@ install:
   - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-guardian==1.1.1; fi"
   - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4; fi"
   - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.7; fi"
+  - "if [[ ${TRAVIS_PYTHON_VERSION::1} == '3' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi"
+  - "if [[ ${DJANGO} == 'https://www.djangoproject.com/download/1.7a2/tarball/'' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi"
   - export PYTHONPATH=.
 
 script:
-- 
cgit v1.2.3