Merge pull request #89 from SparkPost/bump

Bump version, update changelog

CHANGELOG.md

@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
 
+## [1.0.5] - 2016-03-18
+### Fixed
+- Issue where global Django settings object was being modified, causing mixed emails
+
 ## [1.0.4] - 2016-03-10
 ### Added
 - `SPARKPOST_OPTIONS` setting for Django for passing through additional transmission options like `track_opens`, `track_clicks`, and `transactional`
@@ -61,7 +65,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Metrics class for getting a list of campaigns and domains
 - Docs on readthedocs.org
 
-[unreleased]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.4...HEAD
+[unreleased]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.5...HEAD
+[1.0.5]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.4...v1.0.5
 [1.0.4]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.3...v1.0.4
 [1.0.3]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.1...v1.0.2

docs/conf.py

@@ -12,6 +12,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+import datetime
 import sys
 import os
 
@@ -48,8 +49,9 @@
 master_doc = 'index'
 
 # General information about the project.
+now = datetime.datetime.now()
 project = u'python-sparkpost'
-copyright = u'2015, Message Systems'
+copyright = u'2014-{year}, Message Systems'.format(year=now.year)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -58,7 +60,7 @@
 # The short X.Y version.
 version = '1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.4'
+release = '1.0.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='sparkpost',
-    version='1.0.4',
+    version='1.0.5',
     author='Message Systems',
     author_email='appteam@messagesystems.com',
     packages=find_packages(),

sparkpost/__init__.py

@@ -8,7 +8,7 @@
 from .transmissions import Transmissions
 
 
-__version__ = '1.0.4'
+__version__ = '1.0.5'
 
 
 def get_api_key():