From 2fcbd660fb33592329fa071fc54339f3d84cf4cf Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 22 May 2015 17:49:50 +0200 Subject: [PATCH] setup.py: use new get_version() not depending on a __version__ symbol --- setup.py | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/setup.py b/setup.py index 395896c..8f70bf0 100644 --- a/setup.py +++ b/setup.py @@ -28,31 +28,23 @@ class eo_sdist(sdist): os.remove('VERSION') def get_version(): - - version = None - for d in glob.glob('*'): - if not os.path.isdir(d): - continue - module_file = os.path.join(d, '__init__.py') - if not os.path.exists(module_file): - continue - for v in re.findall("""__version__ *= *['"](.*)['"]""", - open(module_file).read()): - assert version is None - version = v - if version: - break - assert version is not None + '''Use the VERSION, if absent generates a version with git describe, if not + tag exists, take 0.0.0- and add the length of the commit log. + ''' + if os.path.exists('VERSION'): + with open('VERSION', 'r') as v: + return v.read() if os.path.exists('.git'): - import subprocess p = subprocess.Popen(['git','describe','--dirty','--match=v*'], - stdout=subprocess.PIPE) + stdout=subprocess.PIPE, stderr=subprocess.PIPE) result = p.communicate()[0] - assert p.returncode == 0, 'git returned non-zero' - new_version = result.split()[0][1:] - assert new_version.split('-')[0] == version, '__version__ must match the last git annotated tag' - version = new_version.replace('-', '.') - return version + if p.returncode == 0: + return result.split()[0][1:].replace('-', '.') + else: + return '0.0.0-%s' % len( + subprocess.check_output( + ['git', 'rev-list', 'HEAD']).splitlines()) + return '0.0.0' class compile_translations(Command):