Permalink
Browse files

Update to version 2.3, add in contributors from recent pull-request m…

…erges
  • Loading branch information...
1 parent 08cb4f4 commit acba8bd124156814ce70dd73c589de4f8d1e5adf @themartorana committed May 4, 2011
Showing with 14 additions and 46 deletions.
  1. +7 −1 README
  2. +4 −42 postmark/__init__.py
  3. +2 −2 postmark/core.py
  4. +1 −1 setup.py
View
@@ -1,4 +1,4 @@
-PMMail and PMBounceManager objects for Postmark (http://postmarkapp.com)
+PMMail and PMBounceManager objects, as well as Django email backend (postmark.django_backend.EmailBackend) for Postmark (http://postmarkapp.com)
CONTRIBUTORS:
Dave Martorana (themartorana)
@@ -7,6 +7,8 @@ Richard Cooper (frozenskys)
Miguel Araujo (maraujop)
Patrick Lauber (digi604)
Brian McFadden (brimcfadden)
+Joel Ryan (joelryan2k)
+Ben Hodgson (benhodgson)
(Did I miss anyone?)
PYTHON INFORMATION:
@@ -16,6 +18,10 @@ PYTHON INFORMATION:
Python 2.6 has JSON support built in.
CHANGE LOG:
+ Version 0.2.3
+ - Merged in support for adding a tag through the Django backend (joelryan2k)
+ - Merged in support for POSTMARK_TEST_MODE overriding and beter settings defaults (benhodgson)
+
Version 0.2.2
- Merged in email mime import fix from brimcfadden
View
@@ -1,9 +1,9 @@
-__version__ = '0.2.2'
-__author__ = "Dave Martorana (http://davemartorana.com) & Richard Cooper (http://frozenskys.com)"
+__version__ = '0.2.3'
+__author__ = "Dave Martorana (http://davemartorana.com), Richard Cooper (http://frozenskys.com), Bill Jones"
__date__ = '2011-January-31'
__url__ = 'http://postmarkapp.com'
__copyright__ = "(C) 2009-2010 David Martorana, Wildbit LLC, Python Software Foundation."
-__contributors__ = "Dave Martorana (themartorana), Bill Jones (oraclebill), Richard Cooper (frozenskys), Miguel Araujo (maraujop), Patrick Lauber (digi604), Brian McFadden (brimcfadden)"
+__contributors__ = "Dave Martorana (themartorana), Bill Jones (oraclebill), Richard Cooper (frozenskys), Miguel Araujo (maraujop), Patrick Lauber (digi604), Brian McFadden (brimcfadden), Joel Ryan (joelryan2k), Ben Hodgson (benhodgson)"
__doc__ = '''
@@ -14,45 +14,6 @@
Last Updated: ''' + __date__ + '''
Contributors: ''' + __contributors__ + '''
- CHANGE LOG:
- Version 0.2.2
- - Merged in email mime import fix from brimcfadden
-
- Version 0.2.1
- - Merged in POSTMARK_TEST_MODE Django setting from maraujop
-
- Version 0.2.0
- - Merged with frozenskys/master to bring in PMBounceManager
- - Support for multiple to/cc (limit: 20 per)
- - Changed .recipient to .to (legacy support for .recipient left in)
- - Tag support (.tag) added
- - Fixed the email endpoint
- - Fixed a Django backend issue for multiple recipients (max 20)
-
- Version 0.1.6
- - Added support for Bounces API
-
- Version 0.1.5
- - Added ".cc" property for carbon copy recipients. Changed django_backend to
- support multiple recipients, and to use "to" rather than "recipients" on the django
- mail object to prevent accidental leakage of BCC recipients.
-
- Version 0.1.4
- - Added ".reply_to" property. The "ReplyTo" custom header is unallowed by Postmark
- now, and their documentation has been updated to reflect the change.
- http://developer.postmarkapp.com
-
- Version 0.1.3
- - Major fix to the way properties were being used, fixes doc strings in properties
- - "custom_headers" is now always a dict, even if set to None
-
- Version 0.1.2
- - Added 'custom_headers' property (must be a dictionary) to PMMail object
- - Added optional 'test' argument to send function to print JSON message instead of actually sending it
-
- Version 0.1.1:
- - Initial release
-
USEAGE:
Make sure you have a Postmark account. Visit
http://postmarkapp.com to sign up for an account.
@@ -72,6 +33,7 @@
POSTMARK_API_KEY = 'your-key'
POSTMARK_SENDER = '<From Name> from@emailaddress.com'
+ POSTMARK_TEST_MODE = True/False
to your settings.py file, and when you create a new PMMail object,
it will grab the API key automatically.
View
@@ -1,9 +1,9 @@
-__version__ = '0.2.0'
+__version__ = '0.2.3'
__author__ = "Dave Martorana (http://davemartorana.com) & Richard Cooper (http://frozenskys.com)"
__date__ = '2010-April-14'
__url__ = 'http://postmarkapp.com'
__copyright__ = "(C) 2009-2010 David Martorana, Wildbit LLC, Python Software Foundation."
-__contributors__ = "Dave Martorana (themartorana), Bill Jones (oraclebill), Richard Cooper (frozenskys)"
+__contributors__ = "Dave Martorana (themartorana), Bill Jones (oraclebill), Richard Cooper (frozenskys), Miguel Araujo (maraujop), Patrick Lauber (digi604), Brian McFadden (brimcfadden), Joel Ryan (joelryan2k), Ben Hodgson (benhodgson)"
#
# Imports (JSON library based on import try)
View
@@ -7,7 +7,7 @@
setup(
name = "python-postmark",
- version = "0.2.0",
+ version = "0.2.3",
packages = find_packages(),
author = "Dave Martorana & Richard Cooper",

0 comments on commit acba8bd

Please sign in to comment.