From f631bead2f6b9b1a41014aceaf82fa95f8819b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 14 Oct 2019 19:39:27 +0200 Subject: [PATCH] update setup.py for python3 --- setup.py | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/setup.py b/setup.py index 803110c..bb0071c 100644 --- a/setup.py +++ b/setup.py @@ -18,27 +18,33 @@ class eo_sdist(sdist): if os.path.exists('VERSION'): os.remove('VERSION') version = get_version() - version_file = open('VERSION', 'w') - version_file.write(version) - version_file.close() + with open('VERSION', 'w') as fd: + fd.write(version) sdist.run(self) if os.path.exists('VERSION'): os.remove('VERSION') def get_version(): if os.path.exists('VERSION'): - version_file = open('VERSION', 'r') - version = version_file.read() - version_file.close() - return version + with open('VERSION', 'r') as v: + return v.read() 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) 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 - return '0' + else: + return '0.0.post%s' % len( + subprocess.check_output( + ['git', 'rev-list', 'HEAD']).splitlines()) + return '0.0' class compile_translations(Command):