From 265c7460e0c21f17e9ee9fd3d138c1807ad1ae75 Mon Sep 17 00:00:00 2001 From: medmunds Date: Wed, 2 Dec 2015 16:59:34 -0800 Subject: [PATCH] Support Django 1.9 release --- .travis.yml | 12 +++++++----- README.rst | 2 +- docs/history.rst | 2 ++ setup.py | 1 + 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 820aa36..ed10cd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,11 +20,13 @@ matrix: - { env: DJANGO=django==1.8, python: 2.7 } - { env: DJANGO=django==1.8, python: 3.4 } - { env: DJANGO=django==1.8, python: pypy } - # Django 1.9 (prerelease): "Python 2.7, 3.4, or 3.5" - - { env: DJANGO="--pre django", python: 2.7 } - - { env: DJANGO="--pre django", python: 3.4 } - - { env: DJANGO="--pre django", python: 3.5 } - - { env: DJANGO="--pre django", python: pypy } + # Django 1.9: "Python 2.7, 3.4, or 3.5" + - { env: DJANGO=django==1.9, python: 2.7 } + - { env: DJANGO=django==1.9, python: 3.4 } + - { env: DJANGO=django==1.9, python: 3.5 } + - { env: DJANGO=django==1.9, python: pypy } + # Django 1.10 (prerelease) + #- { env: DJANGO="--pre django", python: 3.5 } cache: directories: - $HOME/.cache/pip diff --git a/README.rst b/README.rst index a1ab707..b132c0c 100644 --- a/README.rst +++ b/README.rst @@ -29,7 +29,7 @@ package. It includes: * Optional support for Mandrill inbound email and other webhook notifications, via Django signals -Djrill is released under the BSD license. It is tested against Django 1.4--1.8 +Djrill is released under the BSD license. It is tested against Django 1.4--1.9 (including Python 3 with Django 1.6+, and PyPy support with Django 1.5+). Djrill uses `semantic versioning `_. diff --git a/docs/history.rst b/docs/history.rst index f07f0b0..21f6139 100644 --- a/docs/history.rst +++ b/docs/history.rst @@ -91,6 +91,8 @@ Refactored Djrill backend and exceptions Other Djrill 2.0 Changes ~~~~~~~~~~~~~~~~~~~~~~~~ +* Add Django 1.9 support; drop Django 1.3, Python 2.6, and Python 3.2 + * Use a single HTTP connection to the Mandrill API to improve performance when sending multiple messages at once using :func:`~django.core.mail.send_mass_mail`. (You can also directly manage your own long-lived Djrill connection across multiple sends, diff --git a/setup.py b/setup.py index 43ae67e..5c83549 100644 --- a/setup.py +++ b/setup.py @@ -41,6 +41,7 @@ setup( "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", "License :: OSI Approved :: BSD License", "Topic :: Software Development :: Libraries :: Python Modules", "Framework :: Django",