Merge pull request #2128 from szok/django-1.9

Django 1.9 in travis
allegro · Dec 23, 2015 · a60804a · a60804a
2 parents 20c8133 + e831a4f
commit a60804a
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,19 @@
-sudo: required
 language: python
 
 env:
     global:
         - DATABASE_USER=travis
         - DATABASE_PASSWORD=travis
     matrix:
-        - TEST_DB_ENGINE=mysql
-        - TEST_DB_ENGINE=sqlite
+        - DJANGO_VERSION=1.8.7 TEST_DB_ENGINE=sqlite
+        - DJANGO_VERSION=1.8.7 TEST_DB_ENGINE=mysql
+        - DJANGO_VERSION=1.9 TEST_DB_ENGINE=sqlite
+        - DJANGO_VERSION=1.9 TEST_DB_ENGINE=mysql
+
+matrix:
+  allow_failures:
+    - env: DJANGO_VERSION=1.9 TEST_DB_ENGINE=mysql
+    - env: DJANGO_VERSION=1.9 TEST_DB_ENGINE=sqlite
 
 services:
     - docker
@@ -35,6 +41,7 @@ install:
     - gulp
     - make install-test
     - pip install coveralls
+    - pip install django==$DJANGO_VERSION
 
 script:
     - gulp test