From e08e7ccad7cce309455a2f643b5ed21a560f810b Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Sun, 6 Aug 2017 16:05:03 +0200 Subject: [PATCH] Fix man page builds Since Sphinx 1.6 released, pbr's build_sphinx extension has been broken. Specifically, pbr's [build_sphinx]/builders option is ignored. Luckily, sphinx itself ipmlemented the feature but called it just 'builder'[1]. This patch fixes the config setting name and then cleans up a Sphinx extension inclusion that is now automatically included. [1] http://lists.openstack.org/pipermail/openstack-dev/2017-July/119396.html Change-Id: I5da6a996ed442524ddb108a890df2d024ee07c4d --- doc/source/conf.py | 1 - setup.cfg | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 8036067c8e..7369758835 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -46,7 +46,6 @@ sys.path.insert(0, os.path.abspath('./')) # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = ['sphinx.ext.autodoc', - 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.viewcode', 'oslo_config.sphinxconfiggen', diff --git a/setup.cfg b/setup.cfg index 0e3b6fe2df..43bb672943 100644 --- a/setup.cfg +++ b/setup.cfg @@ -44,7 +44,7 @@ tag_date = 0 tag_svn_revision = 0 [build_sphinx] -builders = html,man +builder = html,man all_files = 1 build-dir = doc/build source-dir = doc/source