setup.py: get_version from git only (#6864)

hobo/__init__.py

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

setup.py

@@ -1,19 +1,19 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import glob
+import os
+import re
+import subprocess
+
 from setuptools.command.install_lib import install_lib as _install_lib
 from distutils.command.build import build as _build
 from distutils.command.sdist import sdist
 from distutils.cmd import Command
 from setuptools import setup, find_packages
-import os
-import glob
-import re
 
 class eo_sdist(sdist):
-
     def run(self):
-        print "creating VERSION file"
         if os.path.exists('VERSION'):
             os.remove('VERSION')
         version = get_version()
@@ -21,36 +21,23 @@ class eo_sdist(sdist):
         version_file.write(version)
         version_file.close()
         sdist.run(self)
-        print "removing VERSION file"
         if os.path.exists('VERSION'):
             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
+    if os.path.exists('VERSION'):
+        version_file = open('VERSION', 'r')
+        version = version_file.read()
+        version_file.close()
+        return version
     if os.path.exists('.git'):
-        import subprocess
-        p = subprocess.Popen(['git','describe','--dirty','--match=v*'],
-                stdout=subprocess.PIPE)
+        p = subprocess.Popen(['git', 'describe', '--dirty', '--match=v*'], stdout=subprocess.PIPE)
         result = p.communicate()[0]
-        assert p.returncode == 0, 'git returned non-zero'
-        new_version = result.split()[0][1:]
-        version = new_version.replace('-', '.')
-    return version
-
+        if p.returncode == 0:
+            version = result.split()[0][1:]
+            version = version.replace('-', '.')
+            return version
+    return '0'
 
 class compile_translations(Command):
     description = 'compile message catalogs to MO files via django compilemessages'
@@ -89,12 +76,13 @@ class install_lib(_install_lib):
 setup(
     name='hobo',
     version=get_version(),
-    description='Portail admin',
+    description='Rapid Remote Deployment Daemon',
     author='Frederic Peters',
     author_email='fpeters@entrouvert.com',
     packages=find_packages(),
     include_package_data=True,
     scripts=('manage.py',),
+    url='https://dev.entrouvert.org/projects/hobo/',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',