From a10ea06f470003fb14d1746882ba05b3187f7b89 Mon Sep 17 00:00:00 2001 From: medmunds Date: Thu, 29 Nov 2012 11:03:03 -0800 Subject: [PATCH 1/5] Fix Travis build-status image url --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 5a4aa83..6925ecb 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ Djrill, for Mandrill ==================== -.. image:: https://travis-ci.org/brack3t/Djrill.png +.. image:: https://secure.travis-ci.org/brack3t/Djrill.png :target: https://secure.travis-ci.org/brack3t/Djrill Djrill is an email backend and new message class for Django users that want to take advantage of the Mandrill_ transactional @@ -117,7 +117,7 @@ Djrill is tested against Django 1.3 and 1.4 on Python 2.6 and 2.7. (It may also work with Django 1.2 and Python 2.5, if you use an older version of requests compatible with that code.) -.. image:: https://travis-ci.org/brack3t/Djrill.png +.. image:: https://secure.travis-ci.org/brack3t/Djrill.png :target: https://secure.travis-ci.org/brack3t/Djrill The included tests verify that Djrill constructs the expected Mandrill API From e95448d58c19fb3aa585ad99e3c2008c06b1b2cf Mon Sep 17 00:00:00 2001 From: medmunds Date: Wed, 5 Dec 2012 10:32:08 -0800 Subject: [PATCH 2/5] Add testing on (prerelease) Django 1.5 (including python 3.2) --- .travis.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 62ea652..50abea0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,18 @@ language: python python: - "2.6" - "2.7" + - "3.2" env: - - DJANGO_VERSION=1.3 - - DJANGO_VERSION=1.4 + - DJANGO=django==1.3 + - DJANGO=django==1.4 + - DJANGO=https://github.com/django/django/tarball/stable/1.5.x +matrix: + exclude: + - python: "3.2" + env: DJANGO=django==1.3 + - python: "3.2" + env: DJANGO=django==1.4 install: - - pip install -q Django==$DJANGO_VERSION + - pip install -q $DJANGO --use-mirrors - pip install . --use-mirrors script: python setup.py test From 8c4c3b95e473de587b548c37f7e496bf71df82c4 Mon Sep 17 00:00:00 2001 From: medmunds Date: Wed, 5 Dec 2012 10:50:21 -0800 Subject: [PATCH 3/5] Travis: catch DeprecationWarnings --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 50abea0..2cd0624 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,4 +16,4 @@ matrix: install: - pip install -q $DJANGO --use-mirrors - pip install . --use-mirrors -script: python setup.py test +script: python -Wall setup.py test From 38492e3ea4171d7bdfd28d05f631062f890667b4 Mon Sep 17 00:00:00 2001 From: medmunds Date: Wed, 5 Dec 2012 11:14:10 -0800 Subject: [PATCH 4/5] Travis: can't test python 3 yet -- problem with requests setup script kennethreitz/requests#939 kennethreitz/requests#916 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2cd0624..c3f6dc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: python python: - "2.6" - "2.7" - - "3.2" + # - "3.2" # Requests setup currently broken under python 3 env: - DJANGO=django==1.3 - DJANGO=django==1.4 From cf56fd4a23330e1fbc741fedda0858fd6ffa16ee Mon Sep 17 00:00:00 2001 From: medmunds Date: Wed, 5 Dec 2012 11:17:21 -0800 Subject: [PATCH 5/5] Don't waste Travis resources testing Django 1.5 on python 2.6 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index c3f6dc1..1730f7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,14 @@ env: - DJANGO=https://github.com/django/django/tarball/stable/1.5.x matrix: exclude: + # Django < 1.5 not supported on python 3 - python: "3.2" env: DJANGO=django==1.3 - python: "3.2" env: DJANGO=django==1.4 + # Django 1.5 strongly recommends python 2.7 or later (so skip 2.6) + - python: "2.6" + env: DJANGO=https://github.com/django/django/tarball/stable/1.5.x install: - pip install -q $DJANGO --use-mirrors - pip install . --use-mirrors