Merge lp:~jaypipes/nova/bug771489 into lp:~hudson-openstack/nova/trunk

[Jay Pipes]

Make the import of distutils.extra non-mandatory in setup.py. Just print a warning that i18n commands are not available...

Make the import of distutils.extra non-mandatory in setup.py. Just print a warning that i18n commands are not available...

[Ken Pepple (ken-pepple)]

`$ python setup.py install` works fine on my mac with this branch (it didn't before)

... note that `$ python setup.py` generates an error later down the way with

  (trouble)k-3:bug771489 kpepple$ python setup.py
  Warning: DistUtilsExtra required to use i18n builders.
  To build nova with support for message catalogs, you need
    https://launchpad.net/python-distutils-extra >= 2.18
  usage: setup.py [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
    or: setup.py --help [cmd1 cmd2 ...]
    or: setup.py --help-commands
    or: setup.py cmd --help

  error: no commands supplied

... but that shouldn't be a showstopper

review: Approve

[Trey Morris (tr3buchet)]

good deal

review: Approve

[Rick Harris (rconradharris)]

lgtm, thanks Jay.

review: Approve

=== modified file 'setup.py'
--- setup.py	2011-04-22 17:30:13 +0000
+++ setup.py	2011-04-26 21:31:04 +0000
@@ -25,14 +25,18 @@
 from setuptools import find_packages
 from setuptools.command.sdist import sdist
 
+# In order to run the i18n commands for compiling and
+# installing message catalogs, we use DistUtilsExtra.
+# Don't make this a hard requirement, but warn that
+# i18n commands won't be available if DistUtilsExtra is
+# not installed...
 try:
-    import DistUtilsExtra.auto
+    from DistUtilsExtra.auto import setup
 except ImportError:
-    print >> sys.stderr, 'To build nova you need '\
-                         'https://launchpad.net/python-distutils-extra'
-    sys.exit(1)
-assert DistUtilsExtra.auto.__version__ >= '2.18',\
-       'needs DistUtilsExtra.auto >= 2.18'
+    from setuptools import setup
+    print "Warning: DistUtilsExtra required to use i18n builders. "
+    print "To build nova with support for message catalogs, you need "
+    print "  https://launchpad.net/python-distutils-extra >= 2.18"
 
 gettext.install('nova', unicode=1)
 
@@ -102,7 +106,7 @@
     package_data += [(destdir, files)]
     return package_data
 
-DistUtilsExtra.auto.setup(name='nova',
+setup(name='nova',
       version=version.canonical_version_string(),
       description='cloud computing fabric controller',
       author='OpenStack',