From b1b049962c94f49d1befdcdbec339ea59b3bebbe Mon Sep 17 00:00:00 2001 From: medmunds Date: Sat, 9 Nov 2013 10:43:40 -0800 Subject: [PATCH] Django 1.6 released --- .travis.yml | 4 ++-- README.rst | 4 ++-- docs/contributing.rst | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 215653b..b078045 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: - DJANGO=django==1.3 - DJANGO=django==1.4 - DJANGO=django==1.5 - - DJANGO=https://github.com/django/django/tarball/master/1.6b4 + - DJANGO=django==1.6 #- DJANGO=https://github.com/django/django/tarball/stable/1.6.x matrix: exclude: @@ -20,7 +20,7 @@ matrix: - python: "2.6" env: DJANGO=django==1.5 - python: "2.6" - env: DJANGO=https://github.com/django/django/tarball/master/1.6b4 + env: DJANGO=django==1.6 install: - pip install -q $DJANGO --use-mirrors - pip install . --use-mirrors diff --git a/README.rst b/README.rst index 35d8a3c..260f820 100644 --- a/README.rst +++ b/README.rst @@ -30,8 +30,8 @@ package. It includes: via Django signals * An optional Django admin interface -Djrill is released under the BSD license. It is tested against Django 1.3, 1.4, and 1.5 -(including Python 3 support with Django 1.5). +Djrill is released under the BSD license. It is tested against Django 1.3---1.6 +(including Python 3 support with Django 1.5+). .. END shared-intro diff --git a/docs/contributing.rst b/docs/contributing.rst index 218778e..b23b19c 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -38,6 +38,7 @@ Djrill is `tested on Travis `_ against: * Django 1.3 on Python 2.6 and 2.7 * Django 1.4 on Python 2.6 and 2.7 * Django 1.5 on Python 2.7 and 3.2 +* Django 1.6 on Python 2.7 and 3.2 The included tests verify that Djrill constructs the expected Mandrill API calls, without actually calling Mandrill or sending any email. So the tests