[Python-checkins] r65276 - in doctools/trunk: CHANGES setup.py sphinx/__init__.py sphinx/setup_command.py

georg.brandl python-checkins at python.org
Tue Jul 29 11:51:59 CEST 2008


Author: georg.brandl
Date: Tue Jul 29 11:51:58 2008
New Revision: 65276

Log:
Add distutils command for building Sphinx.


Added:
   doctools/trunk/sphinx/setup_command.py   (contents, props changed)
Modified:
   doctools/trunk/CHANGES
   doctools/trunk/setup.py
   doctools/trunk/sphinx/__init__.py

Modified: doctools/trunk/CHANGES
==============================================================================
--- doctools/trunk/CHANGES	(original)
+++ doctools/trunk/CHANGES	Tue Jul 29 11:51:58 2008
@@ -4,6 +4,11 @@
 New features added
 ------------------
 
+* Added a distutils command `build_sphinx`: When Sphinx is installed,
+  you can call ``python setup.py build_sphinx`` for projects that
+  have Sphinx documentation, which will build the docs and place them
+  in the standard distutils build directory.
+
 * `SerializingHTMLBuilder` was added as new abstract builder that can
   be subclassed to serialize build HTML in a specific format.  The
   `PickleHTMLBuilder` is a concrete subclass of it that uses pickle as

Modified: doctools/trunk/setup.py
==============================================================================
--- doctools/trunk/setup.py	(original)
+++ doctools/trunk/setup.py	Tue Jul 29 11:51:58 2008
@@ -84,7 +84,10 @@
         'console_scripts': [
             'sphinx-build = sphinx:main',
             'sphinx-quickstart = sphinx.quickstart:main'
-        ]
+        ],
+        'distutils.commands': [
+            'build_sphinx = sphinx.setup_command:BuildDoc',
+        ],
     },
     install_requires=requires,
 )

Modified: doctools/trunk/sphinx/__init__.py
==============================================================================
--- doctools/trunk/sphinx/__init__.py	(original)
+++ doctools/trunk/sphinx/__init__.py	Tue Jul 29 11:51:58 2008
@@ -134,7 +134,6 @@
         else:
             app.builder.build_update()
     except KeyboardInterrupt:
-        # catches BaseExceptions in 2.5 -- SystemExit, KeyboardInterrupt
         if use_pdb:
             import pdb
             print >>sys.stderr, darkred('Interrupted while building, starting debugger:')

Added: doctools/trunk/sphinx/setup_command.py
==============================================================================
--- (empty file)
+++ doctools/trunk/sphinx/setup_command.py	Tue Jul 29 11:51:58 2008
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+"""
+    sphinx.setup_command
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Setuptools/distutils commands to assist the building of sphinx
+    documentation.
+
+    :author: Sebastian Wiesner
+    :contact: basti.wiesner at gmx.net
+    :copyright: 2008 by Sebastian Wiesner.
+    :license: MIT.
+"""
+
+import sys
+import os
+from StringIO import StringIO
+from distutils.cmd import Command
+
+from sphinx.application import Sphinx
+from sphinx.util.console import darkred, nocolor
+
+
+class BuildDoc(Command):
+    """Distutils command to build Sphinx documentation."""
+
+    description = 'Build Sphinx documentation'
+    user_options = [
+        ('fresh-env', 'E', 'discard saved environment'),
+        ('all-files', 'a', 'build all files'),
+        ('source-dir=', 's', 'Source directory'),
+        ('build-dir=', None, 'Build directory'),
+        ('builder=', 'b', 'The builder to use. Defaults to "html"'),
+        ]
+    boolean_options = ['fresh-env', 'all-files']
+
+
+    def initialize_options(self):
+        self.fresh_env = self.all_files = False
+        self.source_dir = self.build_dir = None
+        self.conf_file_name = 'conf.py'
+        self.builder = 'html'
+
+    def finalize_options(self):
+        if self.source_dir is None:
+            if os.path.isdir('doc'):
+                for root, dirnames, filenames in os.walk('doc'):
+                    if 'conf.py' in filenames:
+                        self.source_dir = root
+                        self.announce('Using source directory %s' % root)
+                        break
+        self.ensure_dirname('source_dir')
+        self.source_dir = os.path.abspath(self.source_dir)
+
+        if self.build_dir is None:
+            build = self.get_finalized_command('build')
+            self.build_dir = os.path.join(build.build_base, 'sphinx')
+            self.mkpath(self.build_dir)
+        self.ensure_dirname('build_dir')
+        self.doctree_dir = os.path.join(self.build_dir, 'doctrees')
+        self.mkpath(self.doctree_dir)
+        self.builder_target_dir = os.path.join(self.build_dir, self.builder)
+        self.mkpath(self.builder_target_dir)
+
+    def run(self):
+        if not sys.stdout.isatty() or sys.platform == 'win32':
+            # Windows' poor cmd box doesn't understand ANSI sequences
+            nocolor()
+        if not self.verbose:
+            status_stream = StringIO()
+        else:
+            status_stream = sys.stdout
+        app = Sphinx(self.source_dir, self.source_dir,
+                     self.builder_target_dir, self.doctree_dir,
+                     self.builder, {}, status_stream,
+                     freshenv=self.fresh_env)
+
+        try:
+            if self.all_files:
+                app.builder.build_all()
+            else:
+                app.builder.build_update()
+        except Exception, err:
+            if isinstance(err, SystemMessage):
+                sys.stderr, darkred('reST markup error:')
+                print >>sys.stderr, err.args[0].encode('ascii', 'backslashreplace')
+            else:
+                raise


More information about the Python-checkins mailing list