From cd39202a6328f1d701588bf090b4bfbe0131be7f Mon Sep 17 00:00:00 2001
From: Daniel Roy Greenfeld <danny@eventbrite.com>
Date: Mon, 21 Sep 2015 21:31:12 -0700
Subject: [PATCH] Prep for 0.7.0 release

---
 CHANGELOG.md           |  8 ++++++--
 README.rst             | 10 +++++++---
 django_mailgun.py      |  8 ++++----
 setup.py               |  4 ++--
 test_django_mailgun.py |  2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc702c6..711b227 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,14 @@
 All enhancements and patches to cookiecutter-django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2015-09-21]
+### Added
+- Ability to pass in extra tracking options to mailgun via API  (@wsmith)
+
 ## [2015-09-14]
 ### Added
-- Support for `Recipient Variables`
-- Version specification in python module
+- Support for `Recipient Variables` (@wsmith)
+- Version specification in python module (@pydanny)
 
 ## [2015-09-08]
 ### Changed
diff --git a/README.rst b/README.rst
index 591e1ba..b3be298 100644
--- a/README.rst
+++ b/README.rst
@@ -6,8 +6,7 @@ A Django email backend for use with Mailgun
 
 Overview
 =================
-Django-Mailgun is a drop-in mail backend for Django_,
-per http://docs.djangoproject.com/en/dev/topics/email/#e-mail-backends
+Django-Mailgun is a drop-in mail backend for Django_.
 
 Getting going
 =============
@@ -69,4 +68,9 @@ validate your data for compliance with Mailgun's API; it merely maps over whatev
 Mailgun's API states that no more than 3 tags are allowed per email, and each tag must be no greater than
 128 characters (https://documentation.mailgun.com/user_manual.html#tagging).  If you provide 4 tags,
 or a tag longer than 128 characters, Django-Mailgun will attempt to send such (potentially) invalid
-data.  You must ensure what you send is appropriate.
\ No newline at end of file
+data.  You must ensure what you send is appropriate.
+
+Django Email Backend Reference
+================================
+
+* http://docs.djangoproject.com/en/dev/topics/email/#e-mail-backends
diff --git a/django_mailgun.py b/django_mailgun.py
index 3647206..548096f 100644
--- a/django_mailgun.py
+++ b/django_mailgun.py
@@ -7,8 +7,8 @@
 
 from requests.packages.urllib3.filepost import encode_multipart_formdata
 
-__version__ = '0.6.0'
-version = '0.6.0'
+__version__ = '0.7.0'
+version = '0.7.0'
 
 
 # A mapping of smtp headers to API key names, along
@@ -130,8 +130,8 @@ def _send(self, email_message):
                 headers = None
 
             response = requests.post(self._api_url + "messages",
-                auth=("api", self._access_key),
-                data=content, headers=headers)
+                    auth=("api", self._access_key),
+                    data=content, headers=headers)
         except:
             if not self.fail_silently:
                 raise
diff --git a/setup.py b/setup.py
index 8470587..5742759 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 import os
 import sys
 
-version = '0.6.0'
+version = '0.7.0'
 
 if sys.argv[-1] == 'publish':
     os.system('python setup.py sdist upload')
@@ -30,7 +30,7 @@
     'Framework :: Django :: 1.5',
     'Framework :: Django :: 1.6',
     'Framework :: Django :: 1.7',
-'    Framework :: Django :: 1.8',
+    'Framework :: Django :: 1.8',
     'Intended Audience :: Developers',
     'License :: OSI Approved :: MIT License',
     'Operating System :: OS Independent',
diff --git a/test_django_mailgun.py b/test_django_mailgun.py
index 9af7c91..342a1c3 100644
--- a/test_django_mailgun.py
+++ b/test_django_mailgun.py
@@ -66,4 +66,4 @@ def test_extra_headers_map():
         ('o:tracking-opens', 'no'),
         ('v:my-var', 'my_message_id: 123'),
     ]
-    check_output_value(mb, message, test_input, expected_output)
\ No newline at end of file
+    check_output_value(mb, message, test_input, expected_output)