Merge lp:~notmyname/swift/simplify_setup into lp:~hudson-openstack/swift/trunk

[John Dickinson]

simplified setup.py

It contained code to automatically build a change log from bzr. We are moving to git, and we don't use this function anyway--we manually maintain the change log.

I confirmed with Monty Taylor on IRC that the openstack packagers don't use this functionality either.

=== modified file 'setup.py'
--- setup.py	2011-08-11 20:17:28 +0000
+++ setup.py	2011-08-19 16:05:24 +0000
@@ -15,47 +15,13 @@
 # limitations under the License.
 
 from setuptools import setup, find_packages
-from setuptools.command.sdist import sdist
-import os
-import subprocess
-try:
-    from babel.messages import frontend
-except ImportError:
-    frontend = None
 
 from swift import __canonical_version__ as version
 
 
-class local_sdist(sdist):
-    """Customized sdist hook - builds the ChangeLog file from VC first"""
-
-    def run(self):
-        if os.path.isdir('.bzr'):
-            # We're in a bzr branch
-
-            log_cmd = subprocess.Popen(["bzr", "log", "--gnu"],
-                                       stdout=subprocess.PIPE)
-            changelog = log_cmd.communicate()[0]
-            with open("ChangeLog", "w") as changelog_file:
-                changelog_file.write(changelog)
-        sdist.run(self)
-
-
 name = 'swift'
 
 
-cmdclass = {'sdist': local_sdist}
-
-
-if frontend:
-    cmdclass.update({
-        'compile_catalog': frontend.compile_catalog,
-        'extract_messages': frontend.extract_messages,
-        'init_catalog': frontend.init_catalog,
-        'update_catalog': frontend.update_catalog,
-    })
-
-
 setup(
     name=name,
     version=version,
@@ -66,7 +32,6 @@
     url='https://launchpad.net/swift',
     packages=find_packages(exclude=['test', 'bin']),
     test_suite='nose.collector',
-    cmdclass=cmdclass,
     classifiers=[
         'Development Status :: 4 - Beta',
         'License :: OSI Approved :: Apache Software License',