removed django trunk from testing

django-cms · Feb 28, 2014 · a289537 · a289537
1 parent 8bc14f4
commit a289537
Showing 1 changed file with 0 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,9 +18,6 @@ env:
   - DJANGO=1.6 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
   - DJANGO=1.6 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
   - DJANGO=1.6 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0
-  - DJANGO=trunk DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
-  - DJANGO=trunk DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
-  - DJANGO=trunk DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0
   - DJANGO=1.6 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='emailuserapp.EmailUser'
 before_script:
 - sh -c "if [ '$DATABASE_URL' = 'postgres://postgres@127.0.0.1/djangocms_test' ];
@@ -60,16 +57,6 @@ matrix:
     env: DJANGO=1.5 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
   - python: 3.3
     env: DJANGO=1.6 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
-  - python: 3.3
-    env: DJANGO=trunk DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
-
-  - python: 2.6
-    env: DJANGO=trunk DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
-  - python: 2.6
-    env: DJANGO=trunk DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0
-  - python: 2.6
-    env: DJANGO=trunk DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
-
 
   - python: 2.6
     env: DJANGO=1.4 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=1
@@ -78,18 +65,4 @@ matrix:
   - python: 3.3
     env: DJANGO=1.4 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=1
 
-
-  allow_failures:
-  - python: 3.3
-    env: DJANGO=trunk DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
-  - python: 3.3
-    env: DJANGO=trunk DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
-  - python: 3.3
-    env: DJANGO=trunk DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0
-  - python: 2.7
-    env: DJANGO=trunk DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
-  - python: 2.7
-    env: DJANGO=trunk DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
-  - python: 2.7
-    env: DJANGO=trunk DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0
   fast_finish: true