From 95c0ad5874974bfbfd733f1f1e746688d6892bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Thu, 3 Jan 2019 12:15:02 +0100 Subject: [PATCH] misc: adapt version number for PEP 440 (#29421) --- setup.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 0c8fa63..8b68680 100755 --- a/setup.py +++ b/setup.py @@ -73,9 +73,18 @@ def get_version(): stderr=subprocess.PIPE) result = p.communicate()[0] if p.returncode == 0: - version = str(result.split()[0][1:]) - version = version.replace('-', '.') + 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.0' setuptools.setup(