From 2b9836c1cb711db05d681c643bdf4a5359b5c96d Mon Sep 17 00:00:00 2001
From: Iacopo Spalletti <i.spalletti@nephila.it>
Date: Wed, 11 Jun 2014 01:08:27 +0200
Subject: [PATCH] Travis configuration

---
 .travis.yml           | 30 +++++++++++++++++++++++++-----
 requirements-test.txt |  6 ++----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3a1a73b..2651587 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,32 @@
 language: python
 
 python:
-  - "3.3"
-  - "2.7"
-  - "2.6"
+  - 2.7
+  - 2.6
+
+env:
+  matrix:
+  - DJANGO='django>=1.4,<1.5'
+  - DJANGO='django>=1.5,<1.6'
+  - DJANGO='django>=1.6,<1.7'
 
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
-install: pip install -r requirements-test.txt
+install:
+  - pip install $DJANGO
+  - pip install -r requirements-test.txt
 
 # command to run tests, e.g. python setup.py test
-script: python runtests.py
\ No newline at end of file
+script: coverage run runtests.py
+
+after_success: coveralls
+
+matrix:
+  exclude:
+  - python: 3.3
+    env: DJANGO='django>=1.4,<1.5'
+
+  allow_failures:
+    - python: 3.3
+      env: DJANGO='django>=1.5,<1.6'
+    - python: 3.3
+      env: DJANGO='django>=1.6,<1.7'
\ No newline at end of file
diff --git a/requirements-test.txt b/requirements-test.txt
index a2b97ea..1a04794 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,8 +1,6 @@
-django>=1.5.1
-django-cms>3.0
+-r requirements.txt
 coverage
+coveralls
 mock>=1.0.1
 nose>=1.3.0
 django-nose>=1.2
-
-# Additional test requirements go here
\ No newline at end of file