Merge pull request #12 from mailjet/package-version

Improve Package version

Author: jorgii

mailjet_rest/__init__.py

@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 # coding=utf-8
+from mailjet_rest.client import Client
+from mailjet_rest.utils.version import get_version
 
-from .client import Client
+__version__ = get_version()
 
-from ._version import __version__
-__all__ = (Client,)
+__all__ = (Client, get_version)

mailjet_rest/_version.py

@@ -6,7 +6,7 @@
 
 import requests
 from requests.compat import urljoin
-from ._version import __version__
+from .utils.version import get_version
 
 requests.packages.urllib3.disable_warnings()
 
@@ -15,7 +15,7 @@ class Config(object):
     API_URL = 'https://api.mailjet.com/'
     API_REF = 'http://dev.mailjet.com/email-api/v3/'
     version = 'v3'
-    user_agent = 'mailjet-apiv3-python/' + __version__
+    user_agent = 'mailjet-apiv3-python/' + get_version()
 
     def __init__(self, version=None):
         if version is not None:

mailjet_rest/client.py

@@ -0,0 +1,13 @@
+VERSION = (1, 3, 0)
+
+
+def get_version(version=None):
+    '''
+    Calculate package version based on a 3 item tuple.
+    In addition verify that the tuple contains 3 items
+    '''
+    if version is None:
+        version = VERSION
+    else:
+        assert len(version) == 3
+    return 'v{0}.{1}.{2}'.format(*(x for x in version))

mailjet_rest/utils/__init__.py

@@ -2,25 +2,22 @@
 # coding=utf-8
 
 import os
-import re
-from setuptools import setup
+from setuptools import find_packages, setup
 
 HERE = os.path.abspath(os.path.dirname(__file__))
 PACKAGE_NAME = 'mailjet_rest'
 
-# Taken from https://stackoverflow.com/a/39671214/1506051
-__version__ = re.search(
-    r'__version__\s*=\s*[\'"]([^\'"]*)[\'"]',  # It excludes inline comment too
-    open('mailjet_rest/_version.py').read()).group(1)
+# Dynamically calculate the version based on mailjet_rest.VERSION.
+version = __import__('mailjet_rest').get_version()
 
 setup(
     name=PACKAGE_NAME,
-    version=__version__,
+    version=version,
     author='starenka',
     author_email='starenka0@gmail.com',
     maintainer='Mailjet',
     maintainer_email='api@mailjet.com',
-    download_url='https://github.com/mailjet/mailjet-apiv3-python/releases/tag/v'+__version__,
+    download_url='https://github.com/mailjet/mailjet-apiv3-python/releases/tag/v' + version,
     url='https://github.com/mailjet/mailjet-apiv3-python',
     description=('Mailjet V3 API wrapper'),
     classifiers=['Development Status :: 3 - Alpha',
@@ -41,5 +38,5 @@
     install_requires=['requests>=2.4.3'],
     tests_require=['unittest'],
     entry_points={},
-    packages=['mailjet_rest'],
+    packages=find_packages(),
 )

mailjet_rest/utils/version.py

@@ -1,5 +1,5 @@
 import unittest
-from mailjet_rest import Client, __version__
+from mailjet_rest import Client
 import os
 import random
 import string
@@ -52,12 +52,12 @@ def test_get_with_action(self):
             list_id = post_contact_list.json()['Data'][0]['ID']
 
         data = {
-          'ContactsLists': [
-                        {
-                                "ListID": list_id,
-                                "Action": "addnoforce"
-                        }
-                ]
+            'ContactsLists': [
+                {
+                    "ListID": list_id,
+                    "Action": "addnoforce"
+                }
+            ]
         }
         result_add_list = self.client.contact_managecontactslists.create(id=contact_id, data=data)
         self.assertTrue(result_add_list.status_code == 201)
@@ -90,7 +90,7 @@ def test_user_agent(self):
             auth=self.auth,
             version='v3.1'
         )
-        self.assertEqual(self.client.config.user_agent, 'mailjet-apiv3-python/'+__version__)
+        self.assertEqual(self.client.config.user_agent, 'mailjet-apiv3-python/v1.3.0')
 
 
 if __name__ == '__main__':