From 7bb8b93eb5ef7a73622869da7d18d9a3c950be01 Mon Sep 17 00:00:00 2001
From: Bertrand Bordage <bordage.bertrand@gmail.com>
Date: Mon, 29 Sep 2014 23:29:41 +0200
Subject: [PATCH] [Travis CI] Fix incompatibilities.

---
 .travis.yml       | 10 ++++++++--
 cachalot/tests.py |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3db9195..4b4f009 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,13 +16,13 @@ env:
 
 install:
   - pip install Django==$DJANGO psycopg2==$PSYCOPG2 django-redis==$DJANGO_REDIS
-                unittest2 coveralls
+                coveralls
   - if [[ $TRAVIS_PYTHON_VERSION == 3* ]];
     then
       pip install
         -e git+https://github.com/clelland/MySQL-for-Python-3#egg=MySQL-python;
     else
-      pip install MySQL-python==$MYSQL_PYTHON;
+      pip install MySQL-python==$MYSQL_PYTHON unittest2;
     fi
 
 before_script:
@@ -43,3 +43,9 @@ script:
 
 after_success:
   - coveralls
+
+matrix:
+  exclude:
+    # Django 1.7 is not compatible with Python 2.6
+    - python: 2.6
+      env: DJANGO=1.7 PSYCOPG2=2.5.4 MYSQL_PYTHON=1.2.5 DJANGO_REDIS=3.7.1
diff --git a/cachalot/tests.py b/cachalot/tests.py
index 28d8c33..c973592 100644
--- a/cachalot/tests.py
+++ b/cachalot/tests.py
@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 try:
     from unittest import skip
-except ImportError:  # For Python 2.6 & 3.2
+except ImportError:  # For Python 2.6
     from unittest2 import skip
 import datetime
 from django.conf import settings