setup.py: adopt a more PEP440 process to create version (fixes #29918)

This commit is contained in:
Benjamin Dauvergne 2019-01-19 15:32:02 +01:00
parent c52e23b5a7
commit 1097339aeb
1 changed files with 13 additions and 7 deletions

View File

@ -75,22 +75,28 @@ class install_lib(_install_lib):
def get_version(): def get_version():
'''Use the VERSION, if absent generates a version with git describe, if not '''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'): if os.path.exists('VERSION'):
with open('VERSION', 'r') as v: with open('VERSION', 'r') as v:
return v.read() return v.read()
if os.path.exists('.git'): 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) stderr=subprocess.PIPE)
result = p.communicate()[0] result = p.communicate()[0]
if p.returncode == 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: else:
result = '0.0.0-%s' % len(subprocess.check_output( return '0.0.post%s' % len(
['git', 'rev-list', 'HEAD']).splitlines()) subprocess.check_output(
return result.decode('utf-8').replace('-', '.').replace('.g', '+g') ['git', 'rev-list', 'HEAD']).splitlines())
return '0.0.0' return '0.0'
setup(name="authentic2", setup(name="authentic2",