Index: version.py
===================================================================
diff -u -r5818c70699fbe02a31d136f440baee0d9f2cb39d -ra2add7d5c768ab21eba0c61e5ec5c7e84b75eeab
--- version.py	(.../version.py)	(revision 5818c70699fbe02a31d136f440baee0d9f2cb39d)
+++ version.py	(.../version.py)	(revision a2add7d5c768ab21eba0c61e5ec5c7e84b75eeab)
@@ -1 +1,69 @@
-dialin/version.py
\ No newline at end of file
+###########################################################################
+#
+# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+#
+# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+#
+# @file version.py
+#
+# @author (last) Peter Lucia
+# @date (last) 01-Sep-2020
+# @author (original) Peter Lucia
+# @date (original) 16-Jun-2020
+#
+############################################################################
+import subprocess
+
+VERSION = "0.7.0"
+
+
+def get_branch():
+    """
+    Gets the current branch name in the current git repository
+
+    @return: The current branch name, None if it can't be determined
+    """
+
+    try:
+        subprocess.check_output("git rev-parse --abbrev-ref HEAD", shell=True).decode("utf-8").strip()
+    except subprocess.CalledProcessError:
+        return None
+
+
+def get_last_commit():
+    """
+    Gets the latest commit in the current git repository
+
+    @return: (str) the latest commit in the current git repository, None if it can't be determined
+    """
+    try:
+        return subprocess.check_output("git rev-parse --short=7 HEAD", shell=True).decode("utf-8").strip()
+    except subprocess.CalledProcessError:
+        return None
+
+
+def check_if_git_repo():
+    """
+    Checks if we're in a git repo or not to know if we can get the git branch and commit
+
+    @return: True if in a git repo, False otherwise
+    """
+
+    return subprocess.call(["git", "branch"], stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL) == 0
+
+
+branch = None
+commit = None
+
+DEV_VERSION = VERSION
+
+if check_if_git_repo():
+    branch = get_branch()
+    commit = get_last_commit()
+    DEV_VERSION += "-{0}".format(branch)
+    DEV_VERSION += "-{0}".format(commit)
+
+
+if __name__ == '__main__':
+    print(VERSION)