Merge d0ddffd into dd33b2c

django-guardian · Jan 28, 2015 · ef07e80 · ef07e80
2 parents dd33b2c + d0ddffd
commit ef07e80
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,22 @@
 language: python
+sudo: false
 python:
  - 2.6
  - 2.7
  - 3.3
+ - 3.4
 
 env:
  - DJANGO_VERSION=1.2.7
  - DJANGO_VERSION=1.3.7
- - DJANGO_VERSION=1.4.16
- - DJANGO_VERSION=1.5.11
- - DJANGO_VERSION=1.6.8
+ - DJANGO_VERSION=1.4.19
+ - DJANGO_VERSION=1.5.12
+ - DJANGO_VERSION=1.6.10
+ - DJANGO_VERSION=1.7.4
 
 install:
-  - pip install -q mock==0.8 Django==$DJANGO_VERSION coverage coveralls
-  - pip install . --use-mirrors
+  - travis_retry pip install -q mock==1.0.1 Django==$DJANGO_VERSION coverage coveralls
+  - travis_retry pip install --use-mirrors
 
 script:
   - coverage run --source=guardian setup.py test
@@ -33,9 +36,12 @@ matrix:
         - python: 3.3
           env: DJANGO_VERSION=1.3.7
         - python: 3.3
-          env: DJANGO_VERSION=1.4.16
-    include:
-        - python: 3.3
-          env: DJANGO_VERSION=1.7.1
+          env: DJANGO_VERSION=1.4.19
+        - python: 3.4
+          env: DJANGO_VERSION=1.2.7
+        - python: 3.4
+          env: DJANGO_VERSION=1.3.7
         - python: 3.4
-          env: DJANGO_VERSION=1.7.1
+          env: DJANGO_VERSION=1.4.19
+        - python: 2.6
+        - env: DJANGO_VERSION=1.7.4