[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, experimental, updated. debian/2.1.3-1_experimental1

[Garrett Holmstrom]

The following commit has been merged in the experimental branch:
commit f766711d6f9b2f0e834ba346ed8488f39ac1d3c4
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Wed Jan 30 15:21:57 2013 -0800

    Make sdist grab version info from git if possible

diff --git a/.gitignore b/.gitignore
index 5e6756d..6c3d6f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@ core.*
 *.pyc
 *.pyo
 /build
+/dist
 /*.egg-info
diff --git a/setup.py b/setup.py
index 89433ab..f8c190d 100644
--- a/setup.py
+++ b/setup.py
@@ -34,10 +34,21 @@
 from distutils.core import setup
 from distutils.command.build_scripts import build_scripts
 from distutils.command.install_scripts import install_scripts
+from distutils.command.sdist import sdist
 import os.path
+import re
+import subprocess
 
 from euca2ools import __version__
 
+def get_version():
+    try:
+        popen = subprocess.Popen(['git', 'describe'], stdout=subprocess.PIPE)
+        popen.wait()
+        return popen.stdout.read().strip()
+    except:
+        return __version__
+
 # Cheap hack:  install symlinks separately from regular files.
 # cmd.copy_tree accepts a preserve_symlinks option, but when we call
 # ``setup.py install'' more than once the method fails when it encounters
@@ -64,8 +75,35 @@ class install_scripts_and_symlinks(install_scripts):
                 if not os.path.exists(newlink):
                     os.symlink(target, newlink)
 
+class sdist_with_git_version(sdist):
+    '''Like sdist, but using the output of ``git describe'' to fill in
+       __init__.__version__'''
+    def make_release_tree(self, base_dir, files):
+        sdist.make_release_tree(self, base_dir, files)
+
+        try:
+            popen = subprocess.Popen(['git', 'describe'],
+                                     stdout=subprocess.PIPE)
+            popen.wait()
+            version = popen.stdout.read().strip()
+            version_line = '__version__ = \'{0}\'\n'.format(version)
+            old_init_file_name = os.path.join(base_dir, 'euca2ools/__init__.py')
+            new_init_file_name = old_init_file_name + '.new'
+            with open(new_init_file_name, 'w') as new_init_file:
+                with open(old_init_file_name) as old_init_file:
+                    for line in old_init_file:
+                        if re.match("__version__ *= *'.*'", line):
+                            new_init_file.write(version_line)
+                        else:
+                            new_init_file.write(line)
+                new_init_file.flush()
+            os.rename(new_init_file_name, old_init_file_name)
+        except:
+            # Not really a problem; we'll just leave it as-is
+            pass
+
 setup(name = "euca2ools",
-      version = __version__,
+      version = get_version(),
       description = "Elastic Utility Computing Architecture Command Line Tools",
       long_description="Elastic Utility Computing Architecture Command Line Tools",
       author = "Mitch Garnaat",
@@ -209,4 +247,5 @@ setup(name = "euca2ools",
                      'Programming Language :: Python :: 2.7',
                      'Topic :: Internet'],
       cmdclass = {'build_scripts':   build_scripts_except_symlinks,
-                  'install_scripts': install_scripts_and_symlinks})
+                  'install_scripts': install_scripts_and_symlinks,
+                  'sdist':           sdist_with_git_version})

-- 
managing cloud instances for Eucalyptus