From 1097339aeb8f1c5a5815c560387abbe083b1c9d6 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Sat, 19 Jan 2019 15:32:02 +0100 Subject: [PATCH] setup.py: adopt a more PEP440 process to create version (fixes #29918) --- setup.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 875e19829..fd53c63cb 100755 --- a/setup.py +++ b/setup.py @@ -75,22 +75,28 @@ class install_lib(_install_lib): def get_version(): '''Use the VERSION, if absent generates a version with git describe, if not - tag exists, take 0.0.0- and add the length of the commit log. + tag exists, take 0.0- and add the length of the commit log. ''' if os.path.exists('VERSION'): with open('VERSION', 'r') as v: return v.read() if os.path.exists('.git'): - p = subprocess.Popen(['git', 'describe', '--dirty', '--match=v*'], stdout=subprocess.PIPE, + p = subprocess.Popen(['git', 'describe', '--dirty=.dirty','--match=v*'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) result = p.communicate()[0] if p.returncode == 0: - result = result.split()[0][1:] + result = result.decode('ascii').strip()[1:] # strip spaces/newlines and initial v + if '-' in result: # not a tagged version + real_number, commit_count, commit_hash = result.split('-', 2) + version = '%s.post%s+%s' % (real_number, commit_count, commit_hash) + else: + version = result + return version else: - result = '0.0.0-%s' % len(subprocess.check_output( - ['git', 'rev-list', 'HEAD']).splitlines()) - return result.decode('utf-8').replace('-', '.').replace('.g', '+g') - return '0.0.0' + return '0.0.post%s' % len( + subprocess.check_output( + ['git', 'rev-list', 'HEAD']).splitlines()) + return '0.0' setup(name="authentic2",