diff --git a/.travis.yml b/.travis.yml index 62ea652..1730f7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,22 @@ language: python python: - "2.6" - "2.7" + # - "3.2" # Requests setup currently broken under python 3 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: + # 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==$DJANGO_VERSION + - pip install -q $DJANGO --use-mirrors - pip install . --use-mirrors -script: python setup.py test +script: python -Wall setup.py test 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