Index: setup.py =================================================================== diff -u -r6388ebc1ce5d1126394c2718e0d9c5ddf7990bef -r68bb533f7f71736bed620866622f1efd3d10f66f --- setup.py (.../setup.py) (revision 6388ebc1ce5d1126394c2718e0d9c5ddf7990bef) +++ setup.py (.../setup.py) (revision 68bb533f7f71736bed620866622f1efd3d10f66f) @@ -19,31 +19,6 @@ VERSION = "1.0.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: - return 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 @@ -59,40 +34,34 @@ 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__': - check_if_git_repo() - setuptools.setup( - name="leahi_dialin", - author="Micheal Garthwaite", - author_email="mgarthwaite@diality.com", - description="The Diality Dialin API", - packages=setuptools.find_packages(exclude=["test*", "tools", "venv"]), - classifiers=[ # all classifiers: https://pypi.org/classifiers/ - "Programming Language :: Python :: 3.6", - "Operating System :: POSIX :: Linux", - ], - python_requires="~=3.6", - version=DEV_VERSION, - install_requires=[ - "aenum", - "cycler", - "importlib-metadata", - "kiwisolver", - "matplotlib", - "numpy", - "openpyxl", - "pandas", - "pyparsing", - "python-can", - "python-dateutil", - "six", - "wrapt", - ] - ) + if check_if_git_repo(): + setuptools.setup( + name="leahi_dialin", + author="Jonny Paguio", + author_email="jpaguio@diality.com", + description="The Diality Dialin API", + packages=setuptools.find_packages(exclude=["test*", "tools", "venv"]), + classifiers=[ # all classifiers: https://pypi.org/classifiers/ + "Programming Language :: Python :: 3.6", + "Operating System :: POSIX :: Linux", + ], + python_requires="~=3.6", + version=DEV_VERSION, + install_requires=[ + "aenum", + "cycler", + "importlib-metadata", + "kiwisolver", + "matplotlib", + "numpy", + "openpyxl", + "pandas", + "pyparsing", + "python-can", + "python-dateutil", + "six", + "wrapt", + ] + )