4.4.0 - Fix packaging issues

CHANGELOG.md

@@ -1,3 +1,8 @@
+4.4.0
+-----
+
+- Packaging fixes
+
 4.3.9
 -----
 

docs/conf.py

@@ -22,7 +22,7 @@ import sys
 
 sys.path.insert(0, os.path.abspath('..'))
 
-from parsedmarc.__version__ import __version__
+from parsedmarc import __version__
 
 
 # -- General configuration ------------------------------------------------

parsedmarc/__init__.py

@@ -32,12 +32,13 @@ import imapclient
 import imapclient.exceptions
 import mailparser
 
-from parsedmarc.__version__ import __version__
 from parsedmarc.utils import get_base_domain, get_ip_address_info
 from parsedmarc.utils import is_outlook_msg, convert_outlook_msg
 from parsedmarc.utils import timestamp_to_human, human_timestamp_to_datetime
 from parsedmarc.utils import parse_email
 
+__version__ = "4.4.0"
+
 logger = logging.getLogger("parsedmarc")
 logger.debug("parsedmarc v{0}".format(__version__))
 

parsedmarc/__version__.py

@@ -1,11 +0,0 @@
-"""Sets global version values"""
-
-import platform
-
-__version__ = "4.3.9"
-
-USER_AGENT = "Mozilla/5.0 ((0 {1})) parsedmarc/{2}".format(
-            platform.system(),
-            platform.release(),
-            __version__
-        )

parsedmarc/splunk.py

@@ -6,7 +6,7 @@ import json
 import urllib3
 import requests
 
-from parsedmarc.__version__ import __version__
+from parsedmarc import __version__
 from parsedmarc.utils import human_timestamp_to_timestamp
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)

parsedmarc/utils.py

@@ -14,6 +14,7 @@ import mailparser
 import json
 import hashlib
 import base64
+import platform
 
 import dateparser
 import dns.reversename
@@ -24,7 +25,13 @@ import geoip2.errors
 import requests
 import publicsuffix
 
-from parsedmarc.__version__ import USER_AGENT
+__version__ = "4.3.9"
+
+USER_AGENT = "Mozilla/5.0 ((0 {1})) parsedmarc/{2}".format(
+            platform.system(),
+            platform.release(),
+            __version__
+        )
 
 
 logger = logging.getLogger("parsedmarc")

setup.py

@@ -14,7 +14,7 @@ from setuptools import setup
 from codecs import open
 from os import path
 
-from parsedmarc.__version__ import __version__
+__version__ = "4.4.0"
 
 description = "A Python package and CLI for parsing aggregate and " \
               "forensic DMARC reports"