Merge pull request #85 from SparkPost/bump

Bump version, update changelog

Author: richleland

CHANGELOG.md

@@ -4,6 +4,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
 
+## [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`
+- Support for cc, bcc, reply to, and attachments for Django
+
+### Changed
+- Refactored some of the bits in the Django email backend out into a `SparkPostMessage` class which prepares parameters for calls to the `Transmissions.send` method
+
 ## [1.0.3] - 2016-03-03
 ### Added
 - Tox for local testing
@@ -53,7 +61,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.3...HEAD
+[unreleased]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.4...HEAD
+[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
 [1.0.1]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.0...v1.0.1

docs/conf.py

@@ -58,7 +58,7 @@
 # The short X.Y version.
 version = '1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.3'
+release = '1.0.4'
 
 # 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.3',
+    version='1.0.4',
     author='Message Systems',
     author_email='[email protected]',
     packages=find_packages(),

sparkpost/__init__.py

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