From eb39c1e17f96004c08197a32938b0a48b433409a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Fri, 12 Jun 2020 14:04:44 +0200 Subject: [PATCH] build: sync setup.py get_version --- setup.py | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/setup.py b/setup.py index 9f0feb0..029ca45 100644 --- a/setup.py +++ b/setup.py @@ -7,22 +7,6 @@ from setuptools import setup, find_packages from distutils.command.sdist import sdist -def get_version(): - if os.path.exists('VERSION'): - version_file = open('VERSION', 'r') - version = version_file.read() - version_file.close() - return version - if os.path.exists('.git'): - p = subprocess.Popen(['git', 'describe', '--dirty', '--match=v*'], stdout=subprocess.PIPE) - result = p.communicate()[0] - if p.returncode == 0: - version = str(result.split()[0][1:]) - version = version.replace('-', '.') - return version - return '0' - - class eo_sdist(sdist): def run(self): @@ -37,6 +21,33 @@ class eo_sdist(sdist): os.remove('VERSION') +def get_version(): + '''Use the VERSION, if absent generates a version with git describe, if not + 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=.dirty', '--match=v*'], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + ) + result = p.communicate()[0] + if p.returncode == 0: + 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: + return '0.0.post%s' % len(subprocess.check_output(['git', 'rev-list', 'HEAD']).splitlines()) + return '0.0' + + setup( name='passerelle-reunion-fsn', version=get_version(),