Merge lp:~mordred/swift/sphinx-update-sphinx-config into lp:~hudson-openstack/swift/trunk

[Monty Taylor]

Drive sphinx version from setup.py

Added some code to setup.py to conditionally set the current version into
args for sphinx to consume.

[Monty Taylor (mordred)]

Whoops. Found a problem.

Unmerged revisions

46. By Monty Taylor on 2010-07-29

Updated setup to drive the sphinx doc info from setup.py. No need to update
conf.py as well now.

=== modified file 'setup.py'
--- setup.py	2010-07-28 23:02:51 +0000
+++ setup.py	2010-07-29 20:49:39 +0000
@@ -18,6 +18,7 @@
 from setuptools.command.sdist import sdist
 import os
 import subprocess
+from sphinx.setup_command import BuildDoc
 
 
 class local_sdist(sdist):
@@ -36,11 +37,20 @@
 
 
 name = 'swift'
-version = '1.0.2'
+version = '1.0'
+release = '1.0.2'
+command_options={}
 
+if "name=" in [f[0] for f in BuildDoc.user_options]:
+    command_options={
+        'build_sphinx': {
+            'name': ('setup.py', name),
+            'version': ('setup.py', version),
+            'release': ('setup.py', release)}}
+    
 setup(
     name=name,
-    version=version,
+    version=release,
     description='Swift',
     license='Apache License (2.0)',
     author='OpenStack, LLC.',
@@ -49,6 +59,7 @@
     packages=find_packages(exclude=['test', 'bin']),
     test_suite='nose.collector',
     cmdclass={'sdist': local_sdist},
+    command_options=command_options,
     classifiers=[
         'Development Status :: 4 - Beta',
         'License :: OSI Approved :: Apache Software License',