cleanup versioning system

hbmqtt/__init__.py

@@ -1,5 +1,3 @@
-# Copyright (c) 2015 Nicolas JOUANIN
-#
 # See the file license.txt for copying permission.
 
-VERSION = (0, 10, 0)
+__version__ = "0.10.0a0"

hbmqtt/plugins/sys/broker.py

@@ -2,6 +2,7 @@
 #
 # See the file license.txt for copying permission.
 from datetime import datetime
+import hbmqtt
 from hbmqtt.mqtt.packet import PUBLISH
 from hbmqtt.codecs import int_to_bytes_str
 import asyncio
@@ -58,8 +59,7 @@ async def on_broker_pre_start(self, *args, **kwargs):
 
     async def on_broker_post_start(self, *args, **kwargs):
         self._stats[STAT_START_TIME] = datetime.now()
-        from hbmqtt.version import get_version
-        version = 'HBMQTT version ' + get_version()
+        version = f'HBMQTT version {hbmqtt.__version__}'
         self.context.retain_message(DOLLAR_SYS_ROOT + 'version', version.encode())
 
         # Start $SYS topics management

hbmqtt/scripts/broker_script.py

@@ -20,8 +20,9 @@
 import logging
 import asyncio
 import os
+
+import hbmqtt
 from hbmqtt.broker import Broker
-from hbmqtt.version import get_version
 from docopt import docopt
 from hbmqtt.utils import read_yaml_config
 
@@ -54,7 +55,7 @@ def main(*args, **kwargs):
         logger.fatal("Error: Python 3.4+ is required")
         sys.exit(-1)
 
-    arguments = docopt(__doc__, version=get_version())
+    arguments = docopt(__doc__, version=hbmqtt.__version__)
     formatter = "[%(asctime)s] :: %(levelname)s - %(message)s"
 
     if arguments['-d']:

hbmqtt/scripts/pub_script.py

@@ -39,8 +39,9 @@
 import asyncio
 import os
 import json
+
+import hbmqtt
 from hbmqtt.client import MQTTClient, ConnectException
-from hbmqtt.version import get_version
 from docopt import docopt
 from hbmqtt.utils import read_yaml_config
 
@@ -130,7 +131,7 @@ def main(*args, **kwargs):
         logger.fatal("Error: Python 3.4+ is required")
         sys.exit(-1)
 
-    arguments = docopt(__doc__, version=get_version())
+    arguments = docopt(__doc__, version=hbmqtt.__version__)
     #print(arguments)
     formatter = "[%(asctime)s] :: %(levelname)s - %(message)s"
 

hbmqtt/scripts/sub_script.py

@@ -36,9 +36,10 @@
 import asyncio
 import os
 import json
+
+import hbmqtt
 from hbmqtt.client import MQTTClient, ConnectException
 from hbmqtt.errors import MQTTException
-from hbmqtt.version import get_version
 from docopt import docopt
 from hbmqtt.mqtt.constants import QOS_0
 from hbmqtt.utils import read_yaml_config
@@ -110,7 +111,7 @@ def main(*args, **kwargs):
         logger.fatal("Error: Python 3.4+ is required")
         sys.exit(-1)
 
-    arguments = docopt(__doc__, version=get_version())
+    arguments = docopt(__doc__, version=hbmqtt.__version__)
     #print(arguments)
     formatter = "[%(asctime)s] :: %(levelname)s - %(message)s"
 

hbmqtt/version.py

@@ -1,39 +1,15 @@
-# Copyright (c) 2015 Nicolas JOUANIN
-#
 # See the file license.txt for copying permission.
 import datetime
 import os
 import subprocess
+import warnings
 
+import hbmqtt
 
-# Version Management from https://gist.github.com/gilsondev/2790884
-def get_version(version=None):
-    "Returns a PEP 386-compliant version number from VERSION."
-    if version is None:
-        from hbmqtt import VERSION as version
-    else:
-        assert len(version) == 5
-        assert version[3] in ('alpha', 'beta', 'rc', 'final')
 
-    # Now build the two parts of the version number:
-    # main = X.Y[.Z]
-    # sub = .devN - for pre-alpha releases
-    # | {a|b|c}N - for alpha, beta and rc releases
-
-    parts = 2 if version[2] == 0 else 3
-    main = '.'.join(str(x) for x in version[:parts])
-
-    sub = ''
-    if version[3] == 'alpha' and version[4] == 0:
-        git_changeset = get_git_changeset()
-        if git_changeset:
-            sub = '.dev%s' % git_changeset
-
-    elif version[3] != 'final':
-        mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'c'}
-        sub = mapping[version[3]] + str(version[4])
-
-    return str(main + sub)
+def get_version():
+    warnings.warn("hbmqtt.version.get_version() is deprecated, use hbmqtt.__version__ instead")
+    return hbmqtt.__version__
 
 
 def get_git_changeset():

setup.py

@@ -3,11 +3,10 @@
 # See the file license.txt for copying permission.
 
 from setuptools import setup, find_packages
-from hbmqtt.version import get_version
 
 setup(
     name="amqtt",
-    version=get_version(),
+    version="0.10.0a0",
     description="MQTT client/broker using Python asyncio",
     author="Nicolas Jouanin",
     author_email='nico@beerfactory.org',