Generate version from git tags only

docbow_project/__init__.py

@@ -1 +0,0 @@
-__version__='1.2.9'

setup.py

@@ -1,9 +1,8 @@
 #!env python
 
-import glob
+import subprocess
 import os
 import sys
-import re
 
 from setuptools import setup, find_packages
 from setuptools.command.install_lib import install_lib as _install_lib
@@ -38,41 +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():
-    version = 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'):
-        version_file = open('VERSION', 'r')
-        version = version_file.read()
-        version_file.close()
-        return version
-    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
+        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='docbow',
         version=get_version(),