Merge pull request #3168 from yakky/feature/travis_34

Enable python 3.4 on travis
django-cms · May 16, 2014 · 070783d · 070783d
2 parents d897cf0 + 1fb141b
commit 070783d
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 language: python
 python:
+- 3.4
 - 3.3
 - 2.7
 - 2.6
@@ -46,6 +47,18 @@ notifications:
   - irc.freenode.org#django-cms-sprint
 matrix:
   exclude:
+  - python: 3.4
+    env: DJANGO=1.4 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
+  - python: 3.4
+    env: DJANGO=1.4 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
+  - python: 3.4
+    env: DJANGO=1.4 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0
+
+  - python: 3.4
+    env: DJANGO=1.5 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
+  - python: 3.4
+    env: DJANGO=1.6 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
+
   - python: 3.3
     env: DJANGO=1.4 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
   - python: 3.3
@@ -64,5 +77,8 @@ matrix:
     env: DJANGO=1.4 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
   - python: 3.3
     env: DJANGO=1.4 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=1
+  - python: 3.4
+    env: DJANGO=1.4 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=1
+
 
   fast_finish: true