From 18425d3ee02f75f5275b394205abcb5a4ce995bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonah=20Br=C3=BCchert?= Date: Tue, 16 Apr 2024 18:12:48 +0200 Subject: Just hardcode version number --- setup.py | 6 ++---- version.py | 41 ----------------------------------------- 2 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 version.py diff --git a/setup.py b/setup.py index 44f74a8..be96542 100755 --- a/setup.py +++ b/setup.py @@ -1,14 +1,12 @@ #!/usr/bin/env python from distutils.core import setup -from version import * setup(name='hostinfo-tools', - version=get_git_version(), + version="0.2.3", description='Hostinfo database interface scripts', author='Alexander Sulfrian', author_email='alex@spline.inf.fu-berlin.de', url='http://git.spline.inf.fu-berlin.de/hostinfo-tools/', packages=['hostinfo'], - scripts=['bin/hostinfo'], - ) + scripts=['bin/hostinfo']) diff --git a/version.py b/version.py deleted file mode 100644 index 583ed0d..0000000 --- a/version.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- -# To use this script, simply import it your setup.py file, and use the -# results of get_git_version() as your package version: -# -# from version import * -# -# setup( -# version=get_git_version(), -# . -# . -# . -# ) - -__all__ = ["get_git_version"] - -import os -import re -from subprocess import Popen, PIPE - -OWN_DIR = os.path.dirname(os.path.abspath(os.path.realpath(__file__))) - -def call_git_describe(abbrev=4): - try: - p = Popen(['git', 'describe', '--abbrev=%d' % abbrev, '--tags'], - cwd=OWN_DIR, stdout=PIPE, stderr=PIPE) - p.stderr.close() - line = p.stdout.readlines()[0] - return line.strip() - - except: - return None - -def get_git_version(abbrev=4): - version = call_git_describe(abbrev) - if version is None: - raise ValueError("Cannot find the version number!") - - return re.sub('^debian/', '', version) - -if __name__ == "__main__": - print(get_git_version()) -- cgit v1.2.3-1-g7c22