From c01a31a6f208d31ab6ac5136727c5a1ad83deff0 Mon Sep 17 00:00:00 2001 From: Vinod Kurup Date: Tue, 19 Jan 2016 16:23:38 -0500 Subject: [PATCH 1/3] Prepare for 1.1 release --- AUTHORS | 1 + LICENSE.txt | 2 +- bandit/__init__.py | 2 +- docs/conf.py | 2 +- docs/releases.rst | 4 ++-- tox.ini | 4 ++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/AUTHORS b/AUTHORS index 6dc367d..08cca5f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,3 +7,4 @@ Mark Lavin Tobias McNulty Alvin Chow Vinod Kurup +Gavin Wahl diff --git a/LICENSE.txt b/LICENSE.txt index 71c451a..a87e2a5 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2011-2014, Caktus Consulting Group, LLC +Copyright (c) 2011-2016, Caktus Consulting Group, LLC All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/bandit/__init__.py b/bandit/__init__.py index 33c6477..bdb90a1 100644 --- a/bandit/__init__.py +++ b/bandit/__init__.py @@ -6,7 +6,7 @@ 'major': 1, 'minor': 1, 'micro': 0, - 'releaselevel': 'dev', + 'releaselevel': 'final', } diff --git a/docs/conf.py b/docs/conf.py index 126ab29..7e6fe63 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -43,7 +43,7 @@ # General information about the project. project = u'django-email-bandit' -copyright = u'2011-2014, Caktus Consulting Group' +copyright = u'2011-2016, Caktus Consulting Group' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/docs/releases.rst b/docs/releases.rst index 316967b..fcee4cb 100644 --- a/docs/releases.rst +++ b/docs/releases.rst @@ -26,11 +26,11 @@ to a ``DeprecationWarning`` and the following release the feature and it's relat code will be removed. -v1.1 (Released TBD) +v1.1 (Released 2016-01-20) ------------------------------- - Backends now intercept the CC and BCC fields as well - +- Entire domains can be whitelisted. See the :doc:`settings documentation `. v1.0 (Released 2014-03-21) ------------------------------- diff --git a/tox.ini b/tox.ini index 950b6d0..dfbe455 100644 --- a/tox.ini +++ b/tox.ini @@ -15,11 +15,11 @@ deps = https://github.com/django/django/zipball/master [testenv:py33-1.7.X] basepython = python3.3 -deps = https://www.djangoproject.com/download/1.7.b4/tarball/ +deps = django>=1.7,<1.8 [testenv:py27-1.7.X] basepython = python2.7 -deps = https://www.djangoproject.com/download/1.7.b4/tarball/ +deps = django>=1.7,<1.8 [testenv:py33-1.6.X] basepython = python3.3 From f607963cb40db298435be3c14e8b0009b16fe3f8 Mon Sep 17 00:00:00 2001 From: Vinod Kurup Date: Tue, 19 Jan 2016 16:44:21 -0500 Subject: [PATCH 2/3] Test on modern Django versions --- setup.py | 2 ++ tox.ini | 73 +++++++++++++++++--------------------------------------- 2 files changed, 24 insertions(+), 51 deletions(-) diff --git a/setup.py b/setup.py index cbcb52a..38d7b33 100644 --- a/setup.py +++ b/setup.py @@ -32,8 +32,10 @@ def read_file(filename): 'Programming Language :: Python', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Software Development :: Libraries :: Python Modules', ), diff --git a/tox.ini b/tox.ini index dfbe455..3b6c1d1 100644 --- a/tox.ini +++ b/tox.ini @@ -1,61 +1,32 @@ [tox] downloadcache = {toxworkdir}/_download/ -envlist = py33-trunk,py27-trunk,py33-1.7.X,py27-1.7.X,py33-1.6.X,py32-1.6.X,py26-1.6.X,py33-1.5.X,py32-1.5.X,py26-1.5.X,py26-1.4.X,py26-1.3.X,docs +envlist = py26-{1.3,1.4}, + {py26,py32,py33}-{1.5,1.6}, + {py27,py33,py34}-{1.7,1.8}, + {py27,py34}-{1.9,trunk}, + docs [testenv] commands = {envpython} runtests.py - -[testenv:py27-trunk] -basepython = python2.7 -deps = https://github.com/django/django/zipball/master - -[testenv:py33-trunk] -basepython = python3.3 -deps = https://github.com/django/django/zipball/master - -[testenv:py33-1.7.X] -basepython = python3.3 -deps = django>=1.7,<1.8 - -[testenv:py27-1.7.X] -basepython = python2.7 -deps = django>=1.7,<1.8 - -[testenv:py33-1.6.X] -basepython = python3.3 -deps = django>=1.6,<1.7 - -[testenv:py32-1.6.X] -basepython = python3.2 -deps = django>=1.6,<1.7 - -[testenv:py26-1.6.X] -basepython = python2.6 -deps = django>=1.6,<1.7 - -[testenv:py33-1.5.X] -basepython = python3.3 -deps = django>=1.5,<1.6 - -[testenv:py32-1.5.X] -basepython = python3.2 -deps = django>=1.5,<1.6 - -[testenv:py26-1.5.X] -basepython = python2.6 -deps = django>=1.5,<1.6 - -[testenv:py26-1.4.X] -basepython = python2.6 -deps = django>=1.4,<1.5 - -[testenv:py26-1.3.X] -basepython = python2.6 -deps = django>=1.3,<1.4 +basepython = + py26: python2.6 + py27: python2.7 + py32: python3.2 + py33: python3.3 + py34: python3.4 +deps = + 1.3: Django>=1.3,<1.4 + 1.4: Django>=1.4,<1.5 + 1.5: Django>=1.5,<1.6 + 1.6: Django>=1.6,<1.7 + 1.7: Django>=1.7,<1.8 + 1.8: Django>=1.8,<1.9 + 1.9: Django>=1.9,<1.10 + trunk: https://github.com/django/django/archive/master.zip [testenv:docs] -basepython = python2.6 -deps = Sphinx==1.1.3 +basepython = python3.4 +deps = Sphinx==1.3.4 caktus-sphinx-theme==0.1.0 commands = {envbindir}/sphinx-build -a -n -b html -d docs/_build/doctrees docs docs/_build/html From a31a695c3bcad5f5366c7bf699ea15f845f0aa68 Mon Sep 17 00:00:00 2001 From: Vinod Kurup Date: Tue, 19 Jan 2016 17:52:56 -0500 Subject: [PATCH 3/3] Update travis since I updated tox --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b463112..ae72c1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,13 @@ python: - "2.7" env: - - TOXENV=py26-1.3.X - - TOXENV=py26-1.4.X - - TOXENV=py26-1.5.X,py32-1.5.X,py33-1.5.X - - TOXENV=py26-1.6.X,py32-1.6.X,py33-1.6.X - - TOXENV=py27-1.7.X,py33-1.7.X + - TOXENV=py26-1.3 + - TOXENV=py26-1.4 + - TOXENV=py26-1.5,py32-1.5,py33-1.5 + - TOXENV=py26-1.6,py32-1.6,py33-1.6 + - TOXENV=py27-1.7,py33-1.7,py34-1.7 + - TOXENV=py27-1.8,py33-1.8,py34-1.8 + - TOXENV=py27-1.9,py34-1.9 - TOXENV=py27-trunk,py33-trunk install: