From 753c4fc4f6f18e9b224f20f61d4ad1fe91248fc8 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Wed, 21 Nov 2012 18:03:46 +0100
Subject: Travis tests for python 3.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index ccfdeacb..77bc5384 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
 language: python
 
 python:
-  - "2.6"
   - "2.7"
+  - "3.3"
 
 env:
-  - DJANGO=https://github.com/django/django/zipball/master
+  - DJANGO=https://www.djangoproject.com/download/1.5a1/tarball/
   - DJANGO=django==1.4.1 --use-mirrors
   - DJANGO=django==1.3.3 --use-mirrors
 
-- 
cgit v1.2.3


From 17234a5a3fe4b5db33b79e13d6779889c25c1089 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Wed, 21 Nov 2012 18:21:26 +0100
Subject: Also test 3.2

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 77bc5384..8bec7e0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 
 python:
   - "2.7"
+  - "3.2"
   - "3.3"
 
 env:
-- 
cgit v1.2.3


From 80b95438df1c450de62fbea28b26fd91a0bf19d3 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Thu, 22 Nov 2012 00:26:10 +0100
Subject: Don't forget to add six for requirements.

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 8bec7e0b..f97fa36c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ env:
 install:
   - pip install $DJANGO
   - pip install django-filter==0.5.4 --use-mirrors
+  - pip install six --use-mirrors
   - export PYTHONPATH=.
 
 script:
-- 
cgit v1.2.3


From 43c9a1c466a4aab4657419c38451337108e49994 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Thu, 22 Nov 2012 00:33:28 +0100
Subject: Don't test with python 3.3

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index f97fa36c..57b7ef20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ language: python
 python:
   - "2.7"
   - "3.2"
-  - "3.3"
 
 env:
   - DJANGO=https://www.djangoproject.com/download/1.5a1/tarball/
-- 
cgit v1.2.3


From 237e35120decb508bbad560b23ceacbcd6fccdf3 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Fri, 23 Nov 2012 01:22:39 +0100
Subject: Exclude python3.2 for django < 1.5

---
 .travis.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 57b7ef20..6acc9fe2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ python:
 
 env:
   - DJANGO=https://www.djangoproject.com/download/1.5a1/tarball/
-  - DJANGO=django==1.4.1 --use-mirrors
+  - DJANGO=django==1.4.2 --use-mirrors
   - DJANGO=django==1.3.3 --use-mirrors
 
 install:
@@ -17,3 +17,10 @@ install:
 
 script:
   - python rest_framework/runtests/runtests.py
+
+matrix:
+  exclude:
+    - python: "3.2"
+      env: DJANGO=django==1.4.2 --use-mirrors
+    - python: "3.2"
+      env: DJANGO=django==1.3.3 --use-mirrors
-- 
cgit v1.2.3


From bf8ceca12213ade27f7997819ba82a7ba6d2bb99 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Wed, 28 Nov 2012 10:52:03 +0100
Subject: Updated the build to use django 1.5 beta 1.

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 6acc9fe2..e4a82b6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ python:
   - "3.2"
 
 env:
-  - DJANGO=https://www.djangoproject.com/download/1.5a1/tarball/
+  - DJANGO=https://www.djangoproject.com/download/1.5b1/tarball/
   - DJANGO=django==1.4.2 --use-mirrors
   - DJANGO=django==1.3.3 --use-mirrors
 
-- 
cgit v1.2.3


From fa53dde576c8733292eacf27c80cf7a0ad222c3b Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Sun, 2 Dec 2012 01:26:02 +0100
Subject: Reactivated the python 2.6 tests.

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index e4a82b6b..a9e63580 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: python
 
 python:
+  - "2.6"
   - "2.7"
   - "3.2"
 
-- 
cgit v1.2.3


From 92f1109cd826a5f22c377ecc037621f564e7978e Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Wed, 2 Jan 2013 17:52:31 +0100
Subject: Exclude non python 3 compatible django verison from the test matrix.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 714634f5..2eb2ada2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,6 @@ script:
 matrix:
   exclude:
     - python: "3.2"
-      env: DJANGO=django==1.4.2 --use-mirrors
+      env: DJANGO=django==1.4.3 --use-mirrors
     - python: "3.2"
-      env: DJANGO=django==1.3.3 --use-mirrors
+      env: DJANGO=django==1.3.5 --use-mirrors
-- 
cgit v1.2.3


From fccf1814f1af153ede074dcdad12f02b407b092d Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Mon, 7 Jan 2013 22:23:16 +0100
Subject: Test against Django 1.5 rc1

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 2eb2ada2..1ce287c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ python:
 
 env:
   - DJANGO=https://github.com/django/django/zipball/master
-  - DJANGO=https://www.djangoproject.com/download/1.5b2/tarball/
+  - DJANGO=https://www.djangoproject.com/download/1.5c1/tarball/
   - DJANGO=django==1.4.3 --use-mirrors
   - DJANGO=django==1.3.5 --use-mirrors
 
-- 
cgit v1.2.3


From c1e3b42fee73b47d5aa7330cdf8946657742d6f7 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Mon, 7 Jan 2013 22:41:42 +0100
Subject: Conditional six installation (only for django 1.3.5) and install 3.2
 compatible django-filter for python 3.2 test.

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 1ce287c2..e87ca38b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,8 @@ env:
 install:
   - pip install $DJANGO
   - pip install django-filter==0.5.4 --use-mirrors
-  - pip install six --use-mirrors
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install --upgrade -e git+https://github.com/alex/django-filter.git#egg=django-filter; fi"
+  - "if [[ $DJANGO == 'django==1.3.5 --use-mirrors' ]] then pip install six --use-mirrors; fi"
   - export PYTHONPATH=.
 
 script:
-- 
cgit v1.2.3


From 22a7dc27d8638b001d513598e5f0ba13698a1186 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Mon, 7 Jan 2013 23:09:47 +0100
Subject: Typo in the travis.yml.

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index e87ca38b..2cad33ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ install:
   - pip install $DJANGO
   - pip install django-filter==0.5.4 --use-mirrors
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install --upgrade -e git+https://github.com/alex/django-filter.git#egg=django-filter; fi"
-  - "if [[ $DJANGO == 'django==1.3.5 --use-mirrors' ]] then pip install six --use-mirrors; fi"
+  - "if [[ $DJANGO == 'django==1.3.5 --use-mirrors' ]]; then pip install six --use-mirrors; fi"
   - export PYTHONPATH=.
 
 script:
-- 
cgit v1.2.3


From dd456420551449e1e8f3cff798908f9f8256fcdc Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Mon, 7 Jan 2013 23:34:03 +0100
Subject: Try a lighter alternative to install django-filter trunk

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 2cad33ab..1b330441 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ env:
 install:
   - pip install $DJANGO
   - pip install django-filter==0.5.4 --use-mirrors
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install --upgrade -e git+https://github.com/alex/django-filter.git#egg=django-filter; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install --upgrade https://github.com/alex/django-filter/tarball/master; fi"
   - "if [[ $DJANGO == 'django==1.3.5 --use-mirrors' ]]; then pip install six --use-mirrors; fi"
   - export PYTHONPATH=.
 
-- 
cgit v1.2.3


From 86a3ad9b3d4f14e4bd6f834345030bde4ad34835 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Mon, 7 Jan 2013 23:36:39 +0100
Subject: Check for travis builds.

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 1b330441..00b544e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ install:
   - pip install django-filter==0.5.4 --use-mirrors
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install --upgrade https://github.com/alex/django-filter/tarball/master; fi"
   - "if [[ $DJANGO == 'django==1.3.5 --use-mirrors' ]]; then pip install six --use-mirrors; fi"
+  - "echo $DJANGO"
   - export PYTHONPATH=.
 
 script:
-- 
cgit v1.2.3


From 28248f35736a9eb987ca4d552417a0abc60c5a74 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Mon, 7 Jan 2013 23:46:44 +0100
Subject: Attempt with another url for django

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 00b544e7..e205a484 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,14 +7,14 @@ python:
 
 env:
   - DJANGO=https://github.com/django/django/zipball/master
-  - DJANGO=https://www.djangoproject.com/download/1.5c1/tarball/
+  - DJANGO=http://optiminformatique.fr/media/Django-1.5c1.tar.gz
   - DJANGO=django==1.4.3 --use-mirrors
   - DJANGO=django==1.3.5 --use-mirrors
 
 install:
   - pip install $DJANGO
   - pip install django-filter==0.5.4 --use-mirrors
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install --upgrade https://github.com/alex/django-filter/tarball/master; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install https://github.com/alex/django-filter/tarball/master; fi"
   - "if [[ $DJANGO == 'django==1.3.5 --use-mirrors' ]]; then pip install six --use-mirrors; fi"
   - "echo $DJANGO"
   - export PYTHONPATH=.
-- 
cgit v1.2.3


From 0252057ee004cd236a3986892309c8808bd79efe Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Mon, 7 Jan 2013 23:52:26 +0100
Subject: Reverted on the right django 1.5 rc1 url and made sure we use mirrors
 for our django downloads.

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index e205a484..10a4a771 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,9 @@ python:
 
 env:
   - DJANGO=https://github.com/django/django/zipball/master
-  - DJANGO=http://optiminformatique.fr/media/Django-1.5c1.tar.gz
-  - DJANGO=django==1.4.3 --use-mirrors
-  - DJANGO=django==1.3.5 --use-mirrors
+  - DJANGO=https://www.djangoproject.com/download/1.5c1/tarball/
+  - DJANGO="django==1.4.3 --use-mirrors"
+  - DJANGO="django==1.3.5 --use-mirrors"
 
 install:
   - pip install $DJANGO
-- 
cgit v1.2.3


From 5dd76c07065cf0df16a7ae581856e1730d2696e8 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Mon, 7 Jan 2013 23:55:16 +0100
Subject: Correctly remove from the matrix incompatible django / python
 versions.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 10a4a771..556a2642 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,6 @@ script:
 matrix:
   exclude:
     - python: "3.2"
-      env: DJANGO=django==1.4.3 --use-mirrors
+      env: DJANGO="django==1.4.3 --use-mirrors"
     - python: "3.2"
-      env: DJANGO=django==1.3.5 --use-mirrors
+      env: DJANGO="django==1.3.5 --use-mirrors"
-- 
cgit v1.2.3


From 0f0e76d8b1b7a7a28b4ce2c6d8f7ecc89e7219ff Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Tue, 8 Jan 2013 00:00:28 +0100
Subject: Don't double install django-filter.

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 556a2642..572e483b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,10 +13,9 @@ env:
 
 install:
   - pip install $DJANGO
-  - pip install django-filter==0.5.4 --use-mirrors
+  - "if [[ $TRAVIS_PYTHON_VERSION != '3.2' ]]; then pip install django-filter==0.5.4 --use-mirrors; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install https://github.com/alex/django-filter/tarball/master; fi"
   - "if [[ $DJANGO == 'django==1.3.5 --use-mirrors' ]]; then pip install six --use-mirrors; fi"
-  - "echo $DJANGO"
   - export PYTHONPATH=.
 
 script:
-- 
cgit v1.2.3


From 00752dcd2a3647f2de2a259934753745597e3ade Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 1 Feb 2013 15:07:51 +0000
Subject: Py3k cleanup

---
 .travis.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 572e483b..662ea5c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,18 +4,17 @@ python:
   - "2.6"
   - "2.7"
   - "3.2"
+  - "3.3"
 
 env:
-  - DJANGO=https://github.com/django/django/zipball/master
   - DJANGO=https://www.djangoproject.com/download/1.5c1/tarball/
   - DJANGO="django==1.4.3 --use-mirrors"
   - DJANGO="django==1.3.5 --use-mirrors"
 
 install:
   - pip install $DJANGO
-  - "if [[ $TRAVIS_PYTHON_VERSION != '3.2' ]]; then pip install django-filter==0.5.4 --use-mirrors; fi"
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install https://github.com/alex/django-filter/tarball/master; fi"
-  - "if [[ $DJANGO == 'django==1.3.5 --use-mirrors' ]]; then pip install six --use-mirrors; fi"
+  - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-filter==0.5.4 --use-mirrors; fi"
+  - "if [[ ${TRAVIS_PYTHON_VERSION::1} == '3' ]]; then pip install https://github.com/alex/django-filter/tarball/master; fi"
   - export PYTHONPATH=.
 
 script:
@@ -27,3 +26,7 @@ matrix:
       env: DJANGO="django==1.4.3 --use-mirrors"
     - python: "3.2"
       env: DJANGO="django==1.3.5 --use-mirrors"
+    - python: "3.3"
+      env: DJANGO="django==1.4.3 --use-mirrors"
+    - python: "3.3"
+      env: DJANGO="django==1.3.5 --use-mirrors"
-- 
cgit v1.2.3