From 0c276a0e806e16f08ad41828819ead7072f2c655 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 30 Jul 2014 19:15:47 +0300 Subject: [PATCH 1/4] Improved build matrix. --- .travis.yml | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a2f346..bbc2ca0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,22 +4,41 @@ python: - 2.7 - 3.2 - 3.3 + - 3.4 env: - - DJANGO=django==1.4.10 - - DJANGO=django==1.5.5 - - DJANGO=django==1.6 - - DJANGO=django==1.6 DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" - - DJANGO=django==1.6 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + - DJANGO=django==1.4.13 + - DJANGO=django==1.5.8 + - DJANGO=django==1.6.5 + - DJANGO=django==1.6.5 DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" + - DJANGO=django==1.6.5 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + - DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" + - DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" + - DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" matrix: exclude: - python: 3.2 - env: DJANGO=django==1.4.10 + env: DJANGO=django==1.4.13 - python: 3.3 - env: DJANGO=django==1.4.10 + env: DJANGO=django==1.4.13 + - python: 3.4 + env: DJANGO=django==1.4.13 - python: 3.2 - env: DJANGO=django==1.6 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + env: DJANGO=django==1.6.5 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - python: 3.3 - env: DJANGO=django==1.6 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + env: DJANGO=django==1.6.5 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + - python: 3.4 + env: DJANGO=django==1.6.5 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + - python: 3.2 + env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + - python: 3.3 + env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + - python: 3.4 + env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + allow_failures: + - env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" + - env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" + - env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + services: - postgresql - mysql @@ -34,5 +53,3 @@ before_script: script: python src/test_project/manage.py test watson notifications: email: false - - From fe2c6614adb3071a34c6aef57975c53032cf7465 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 30 Jul 2014 19:24:11 +0300 Subject: [PATCH 2/4] Forgot to exclude 2.6 for Django 1.7. --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index bbc2ca0..5ec3b91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,12 @@ matrix: env: DJANGO=django==1.6.5 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - python: 3.4 env: DJANGO=django==1.6.5 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + - python: 2.6 + env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" + - python: 2.6 + env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" + - python: 2.6 + env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - python: 3.2 env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - python: 3.3 From e98010e927e37512464e8213088b33b810a9b42d Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 30 Jul 2014 19:32:04 +0300 Subject: [PATCH 3/4] Large matrixes should fast finish. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5ec3b91..e4c50ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,6 +44,7 @@ matrix: - env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" - env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" - env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + fast_finish: true services: - postgresql From 7c36f29605156e53f3d0a52bd0d3ebe10c8d9cd4 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 30 Jul 2014 19:37:57 +0300 Subject: [PATCH 4/4] Fixed copy/paste typo. --- .travis.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index e4c50ea..9478483 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,9 @@ env: - DJANGO=django==1.6.5 - DJANGO=django==1.6.5 DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" - DJANGO=django==1.6.5 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - - DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" - - DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" - - DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + - DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" + - DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" + - DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" matrix: exclude: - python: 3.2 @@ -29,21 +29,21 @@ matrix: - python: 3.4 env: DJANGO=django==1.6.5 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - python: 2.6 - env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" + env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" - python: 2.6 - env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" + env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" - python: 2.6 - env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - python: 3.2 env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - python: 3.3 - env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - python: 3.4 - env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" allow_failures: - - env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" - - env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" - - env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" + - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" + - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" fast_finish: true services: