0.4.12 and some housekeeping

themartorana · Jan 18, 2017 · 53aef47 · 53aef47
1 parent ef39bb3
commit 53aef47
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/postmark/__init__.py b/postmark/__init__.py
@@ -1,4 +1,4 @@
-__version__         = '0.4.10'
+__version__         = '0.4.12'
 __author__          = "Dave Martorana (http://davemartorana.com), Richard Cooper (http://frozenskys.com), Bill Jones (oraclebill), Dmitry Golomidov (deeGraYve)"
 __date__            = '2010-April-14'
 __url__             = 'http://postmarkapp.com'
@@ -84,5 +84,4 @@
 
 '''
 
-
-from .core import *
+from postmark.core import *
diff --git a/postmark/core.py b/postmark/core.py
@@ -1,12 +1,8 @@
-__version__         = '0.4.11'
-__author__          = "Dave Martorana (http://davemartorana.com), Richard Cooper (http://frozenskys.com), Bill Jones (oraclebill), Dmitry Golomidov (deeGraYve)"
-__date__            = '2010-April-14'
-__url__             = 'http://postmarkapp.com'
-__copyright__       = "(C) 2009-2014 David Martorana, Wildbit LLC, Python Software Foundation."
-
 #
 # Imports (JSON library based on import try)
 
+from postmark import __version__
+
 try:
     from email.mime.base import MIMEBase
 except ImportError as e:
@@ -22,7 +18,6 @@
     from http.client import HTTPConnection
     from urllib.parse import urlencode
 
-import collections
 from contextlib import closing
 
 try:

diff --git a/postmark/django_backend.py b/postmark/django_backend.py
@@ -4,7 +4,7 @@
 from django.core.mail import EmailMessage, EmailMultiAlternatives
 import base64
 
-from .core import PMMail, PMBatchMail
+from postmark.core import PMMail, PMBatchMail
 
 class PMEmailMessage(EmailMessage):
     def __init__(self, *args, **kwargs):

diff --git a/setup.py b/setup.py
@@ -1,13 +1,17 @@
 from distutils.core import setup
+from distutils.util import convert_path
 
-import postmark
-
+postmark = {}
+ver_path = convert_path('postmark/__init__.py')
+with open(ver_path) as ver_file:
+    exec(ver_file.read(), postmark)
 
 setup(
     name="python-postmark",
-    version=postmark.__version__,
+    version=postmark['__version__'],
     packages=['postmark'],
     author="Dave Martorana (http://davemartorana.com), Richard Cooper (http://frozenskys.com), Bill Jones (oraclebill), Dmitry Golomidov (deeGraYve)",
+    author_email="[email protected]",
     license='BSD',
     description="Postmark library for Python 2.7 and greater.",
     long_description="Note: To use Python 2.4 or 2.5, please use python-postmark version 0.3.2. Python 2.6 use version 0.4.4.",