diff --git a/.travis.yml b/.travis.yml index e1deb50c6..0476be800 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ language: python python: - 2.6 - 2.7 + - 3.2 - 3.3 - 3.4 @@ -11,10 +12,11 @@ services: env: - DJANGO=1.6.7 PSYCOPG2=2.5.4 MYSQL-PYTHON=1.2.5 DJANGO_REDIS=3.7.1 + - DJANGO=1.7 PSYCOPG2=2.5.4 MYSQL-PYTHON=1.2.5 DJANGO_REDIS=3.7.1 install: - pip install Django==$DJANGO psycopg2==$PSYCOPG2 django-redis==$DJANGO_REDIS - coveralls + unittest2 coveralls - if [[ $TRAVIS_PYTHON_VERSION == 3* ]]; then pip install diff --git a/cachalot/tests.py b/cachalot/tests.py index a884f4e64..28d8c3366 100644 --- a/cachalot/tests.py +++ b/cachalot/tests.py @@ -1,7 +1,10 @@ # coding: utf-8 from __future__ import unicode_literals -from unittest import skip +try: + from unittest import skip +except ImportError: # For Python 2.6 & 3.2 + from unittest2 import skip import datetime from django.conf import settings from django.contrib.auth.models import User, Permission, Group