From d3495401a6154e4fb1d6ab5b6d69c9038aee76fb Mon Sep 17 00:00:00 2001
From: Richard Leland <rich@richleland.com>
Date: Sat, 1 Oct 2016 20:32:05 -0400
Subject: [PATCH] Bump version, update changelog

---
 CHANGELOG.md          | 15 ++++++++++++++-
 docs/conf.py          |  4 ++--
 setup.py              |  5 +++--
 sparkpost/__init__.py |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b14603..0c25ad5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 - [Compare to latest release][unreleased]
 
+## [1.3.0] - 2016-10-01
+### Added
+- [#121](https://github.com/SparkPost/python-sparkpost/pull/121) Added extended error code to `SparkPostAPIException` class
+- [#124](https://github.com/SparkPost/python-sparkpost/pull/124) Added `delete` method to `Transmission` class
+- CI tests now also run against Python 3.5
+
+### Changed
+- [#123](https://github.com/SparkPost/python-sparkpost/pull/123) Updated RequestsTransport to use a requests session so HTTP Keep Alive is honored
+
+### Fixed
+- [#115](https://github.com/SparkPost/python-sparkpost/pull/115) Guess attachment mimetype in Django email backend if not provided
+
 ## [1.2.0] - 2016-04-19
 ### Added
 - [#109](https://github.com/SparkPost/python-sparkpost/pull/109) Support for specifying `template`, `substitution_data` when using the Django email backend
@@ -86,7 +98,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.2.0...HEAD
+[unreleased]: https://github.com/sparkpost/python-sparkpost/compare/v1.3.0...HEAD
+[1.2.0]: https://github.com/sparkpost/python-sparkpost/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/sparkpost/python-sparkpost/compare/v1.1.1...v1.2.0
 [1.1.1]: https://github.com/sparkpost/python-sparkpost/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.5...v1.1.0
diff --git a/docs/conf.py b/docs/conf.py
index 2e5cbc0..9fc8840 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.2'
+version = '1.3'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0'
+release = '1.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index d6f2da2..c5c6e56 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name='sparkpost',
-    version='1.2.0',
+    version='1.3.0',
     author='SparkPost',
     author_email='developers@sparkpost.com',
     packages=find_packages(),
@@ -16,7 +16,7 @@
     long_description=readme,
     install_requires=['requests>=2.5.1'],
     classifiers=[
-        'Development Status :: 1 - Planning',
+        'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'Topic :: Communications :: Email',
         'License :: OSI Approved :: Apache Software License',
@@ -24,5 +24,6 @@
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
     ],
 )
diff --git a/sparkpost/__init__.py b/sparkpost/__init__.py
index c503a39..dcff0d6 100644
--- a/sparkpost/__init__.py
+++ b/sparkpost/__init__.py
@@ -9,7 +9,7 @@
 from .transmissions import Transmissions
 
 
-__version__ = '1.2.0'
+__version__ = '1.3.0'
 
 
 class SparkPost(object):