entrouvert
/
authentic2-cut
16
0
Fork 0
Code Issues Pull Requests Releases Activity

setup.py: python3 compatibility + get_version() PEP440 (#30079)

This commit is contained in:
Benjamin Dauvergne 2019-01-24 16:17:18 +01:00
parent 94758baba8
commit cc2646da28
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
setup.py
View File

@ -41,7 +41,7 @@ class build(_build):
class eo_sdist(sdist): class eo_sdist(sdist):
def run(self): def run(self):
print "creating VERSION file" print("creating VERSION file")
if os.path.exists('VERSION'): if os.path.exists('VERSION'):
os.remove('VERSION') os.remove('VERSION')
version = get_version() version = get_version()
@ -49,7 +49,7 @@ class eo_sdist(sdist):
version_file.write(version) version_file.write(version)
version_file.close() version_file.close()
sdist.run(self) sdist.run(self)
print "removing VERSION file" print("removing VERSION file")
if os.path.exists('VERSION'): if os.path.exists('VERSION'):
os.remove('VERSION') os.remove('VERSION')
@ -61,19 +61,29 @@ class install_lib(_install_lib):
def get_version(): def get_version():
'''Use the VERSION, if absent generates a version with git describe, if not
tag exists, take 0.0- and add the length of the commit log.
'''
if os.path.exists('VERSION'): if os.path.exists('VERSION'):
version_file = open('VERSION', 'r') with open('VERSION', 'r') as v:
version = version_file.read() return v.read()
version_file.close()
return version
if os.path.exists('.git'): 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] result = p.communicate()[0]
if p.returncode == 0: if p.returncode == 0:
version = result.split()[0][1:] result = result.decode('ascii').strip()[1:] # strip spaces/newlines and initial v
version = version.replace('-', '.').replace('.g', '+g') 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 version
return '0' else:
return '0.0.post%s' % len(
subprocess.check_output(
['git', 'rev-list', 'HEAD']).splitlines())
return '0.0'
setup( setup(