From b57e50cc21ecb415375998df5030d25302dcbb02 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 5 Mar 2015 23:04:31 +0100 Subject: [PATCH] =?UTF-8?q?Utilise=20uniquement=20les=20tags=20pour=20g?= =?UTF-8?q?=C3=A9n=C3=A9rer=20les=20versions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 53 ++++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/setup.py b/setup.py index 45e4eae..0641f2a 100755 --- a/setup.py +++ b/setup.py @@ -4,6 +4,7 @@ ''' import os +import subprocess from setuptools import setup, find_packages from setuptools.command.install_lib import install_lib as _install_lib from distutils.command.build import build as _build @@ -36,40 +37,42 @@ class build(_build): class sdist(_sdist): sub_commands = [('compile_translations', None)] + _sdist.sub_commands + def run(self): + print "creating VERSION file" + if os.path.exists('VERSION'): + os.remove('VERSION') + version = get_version() + version_file = open('VERSION', 'w') + version_file.write(version) + version_file.close() + _sdist.run(self) + print "removing VERSION file" + if os.path.exists('VERSION'): + os.remove('VERSION') + class install_lib(_install_lib): def run(self): self.run_command('compile_translations') _install_lib.run(self) def get_version(): - import glob - import re - import os - - 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' setup(name="project-name",