From 4ac5f21da7528fce0ff035d3337d46d498457bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 29 Jan 2020 13:29:12 +0100 Subject: [PATCH] misc: update setup.py for python 3 --- setup.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index 8fe022c..c294eb1 100755 --- a/setup.py +++ b/setup.py @@ -41,7 +41,6 @@ class build(_build): class eo_sdist(sdist): def run(self): - print "creating VERSION file" if os.path.exists('VERSION'): os.remove('VERSION') version = get_version() @@ -49,7 +48,6 @@ class eo_sdist(sdist): version_file.write(version) version_file.close() sdist.run(self) - print "removing VERSION file" if os.path.exists('VERSION'): os.remove('VERSION') @@ -61,18 +59,26 @@ class install_lib(_install_lib): 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 = 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' setup(name='authentic2-auth-fedict',