From e3f77953c52bc278bfe44db32c9a7c3021bd8914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 19 Jul 2016 07:27:42 +0200 Subject: [PATCH] misc: generate a version number that's compatible with PEP 440 (#12641) --- setup.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 9f67b4d..c762b6b 100644 --- a/setup.py +++ b/setup.py @@ -32,22 +32,28 @@ class eo_sdist(sdist): 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*'], + p = subprocess.Popen(['git','describe','--dirty=.dirty','--match=v*'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) result = p.communicate()[0] if p.returncode == 0: - return result.split()[0][1:].replace('-', '.') + result = result.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.dev%s+%s' % (real_number, commit_count, commit_hash) + else: + version = result + return version else: - return '0.0.0-%s' % len( + return '0.0.dev%s' % len( subprocess.check_output( ['git', 'rev-list', 'HEAD']).splitlines()) - return '0.0.0' + return '0.0' class compile_translations(Command): -- 2.8.1