Merge lp:~mordred/glance/conditional-sphinx into lp:~hudson-openstack/glance/trunk

[Monty Taylor]

Should fix the sphinx issue.

[Jay Pipes (jaypipes)]

cool.

review: Approve

[OpenStack Infra (hudson-openstack)]

The person who submitted this branch (mordred) does not appear in http://wiki.openstack.org/Contributors?action=raw

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Rick Harris (rconradharris)]

Small-nit:

36 +except:

The unguarded `except` looks a little suspicious, should this be `except ImportError` or are there other exceptions here that would be considered 'normal'?

review: Needs Fixing

[Monty Taylor (mordred)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 01/25/2011 01:41 PM, Rick Harris wrote:
> Review: Needs Fixing Small-nit:
>
> 36 +except:
>
> The unguarded `except` looks a little suspicious, should this be
> `except ImportError` or are there other exceptions here that would be
> considered 'normal'?

Well - normally I'd agree with you. In _this_ case, the idea is that we
want sphinx building to be optional - so if something goes wrong in
setting that up, we'd like to just move on.

I can put in an ImportError: trap though if you'd prefer.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk0/WhwACgkQ2Jv7/VK1RgEzvACfZN9jwkvA7gv8R9rNvyopNZRt
40IAoOa7C6ZGIANSEkyqIpoopDnAOSjv
=Ewxf
-----END PGP SIGNATURE-----

[Rick Harris (rconradharris)]

I'm leaving it as `except`, though, it might be preferable to do something like

try:
  <stuff>
except ImportError:
  pass # if it's not there, don't worry about it
except:
  LOG.warn("Strange thing occured, perhaps look into this?")

[Rick Harris (rconradharris)]

s/I'm leaving it as/I'm fine leaving it as/

[Jay Pipes (jaypipes)]

I'll fix the except nit later. Gotta get this in to release a new tarball...

=== modified file 'setup.py'
--- setup.py	2011-01-25 17:02:07 +0000
+++ setup.py	2011-01-25 19:50:05 +0000
@@ -19,15 +19,6 @@
 
 from setuptools import setup, find_packages
 from setuptools.command.sdist import sdist
-from sphinx.setup_command import BuildDoc
-
-
-class local_BuildDoc(BuildDoc):
-    def run(self):
-        for builder in ['html', 'man']:
-            self.builder = builder
-            self.finalize_options()
-            BuildDoc.run(self)
 
 
 class local_sdist(sdist):
@@ -44,12 +35,25 @@
                 changelog_file.write(changelog)
         sdist.run(self)
 
+cmdclass = {'sdist': local_sdist}
+
+try:
+    from sphinx.setup_command import BuildDoc
+    class local_BuildDoc(BuildDoc):
+        def run(self):
+            for builder in ['html', 'man']:
+                self.builder = builder
+                self.finalize_options()
+                BuildDoc.run(self)
+    cmdclass['build_sphinx'] = local_BuildDoc
+
+except:
+    pass
+
 
 name = 'glance'
 version = '0.1.5'
 
-cmdclass = {'sdist': local_sdist,
-            'build_sphinx': local_BuildDoc}
 
 setup(
     name=name,