From 35f773f084a96b1218d1f20e39ad22636f26712e Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 9 Feb 2016 11:55:02 +0100 Subject: [PATCH] setup.py: update get_version --- setup.py | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/setup.py b/setup.py index 35c6d8a..5f38c56 100755 --- a/setup.py +++ b/setup.py @@ -6,34 +6,23 @@ from setuptools import setup, find_packages def get_version(): - import glob - import re - import os - - version = None - for d in glob.glob('src/*'): - 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="django-kerberos",