summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Péters <fpeters@entrouvert.com>2019-01-03 11:15:02 (GMT)
committerFrédéric Péters <fpeters@entrouvert.com>2019-01-03 13:47:28 (GMT)
commit95c0ad5874974bfbfd733f1f1e746688d6892bf2 (patch)
tree44b698fe1b5f6bad91eba984168ce95cc4a36319
parentf8b358e23267a944a4c18625d536a46e0060f5d3 (diff)
downloadeopayment-1.32.zip
eopayment-1.32.tar.gz
eopayment-1.32.tar.bz2
misc: adapt version number for PEP 440 (#29421)v1.32
-rwxr-xr-xsetup.py13
1 files 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(