Merge pull request #10 from caktus/prepare-release

Prepare for 1.1 release
caktus · Jan 20, 2016 · 215c8cb · 215c8cb
2 parents 8713f18 + a31a695
commit 215c8cb
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 61 deletions.
diff --git 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:

diff --git 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
@@ -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
@@ -6,7 +6,7 @@
     'major': 1,
     'minor': 1,
     'micro': 0,
-    'releaselevel': 'dev',
+    'releaselevel': 'final',
 }
 
 

diff --git 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
@@ -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 <settings>`.
 
 v1.0 (Released 2014-03-21)
 -------------------------------

diff --git 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
@@ -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 = https://www.djangoproject.com/download/1.7.b4/tarball/
-
-[testenv:py27-1.7.X]
-basepython = python2.7
-deps = https://www.djangoproject.com/download/1.7.b4/tarball/
-
-[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