updated travis-ci configuration

.travis.yml

@@ -3,27 +3,25 @@ language: python
 python:
   - "2.6"
   - "2.7"
+  - "3.3"
 
 env:
-  - DJANGO=Django==1.3.7
-  - DJANGO=Django==1.4.5
-  - DJANGO=https://www.djangoproject.com/download/1.5c2/tarball/
+  - DJANGO_VERSION=1.3.7
+  - DJANGO_VERSION=1.4.5
+  - DJANGO_VERSION=1.5.1
 
 matrix:
   exclude:
-    # Django 1.5 drops support for Python 2.5
-   - python: "2.5"
-     env: DJANGO=https://www.djangoproject.com/download/1.5c2/tarball/
-  allow_failures:
-    # Failing due to Django 1.5 dropping CBV support
-    - env: DJANGO=https://www.djangoproject.com/download/1.5c2/tarball/
+    - python: "3.3"
+      env: DJANGO_VERSION=1.3.7
+    - python: "3.3"
+      env: DJANGO_VERSION=1.4.5
 
 # command to install dependencies
 install:
-  - pip install -q $DJANGO --use-mirrors
-  - pip install -q unittest2
-  # No requirements apart from Django
-  # - pip install -r requirements.txt --use-mirrors
+  - "pip install -q Django==$DJANGO_VERSION --use-mirrors"
+  - "if [[ $DJANGO_VERSION < 1.5 ]]; then pip install -q six --use-mirrors; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install -q unittest2; fi"
 
 # command to run tests
 script: python runtests.py