From 936404b90a954609f0c94582df0e2fd700948cea Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 12 Apr 2017 14:03:54 +0100 Subject: [PATCH] setup.cfg: Explicitly set [build_sphinx] builder An recent change in pbr changed the default behavior of pbr's variants of the 'sphinx_build' setuptools plugin [1]. Previously, pbr defaulted to building both HTML and man page output, but it now builds only the former. nova happens to be one of the rare projects that _does_ care about man pages so mitigate the impact of this change by explicitly setting the 'builder' configuration option to build HTML and man page output. While we're at it, the 'build_apiguide' section is removed as this doesn't actually do anything and is a remnant of a broken cookiecutter file [2]. [1] https://review.openstack.org/#/c/456157/ [2] https://review.openstack.org/#/c/448164/ Change-Id: I79efedd44b11c9832ae8cb36e54c2567f85fcf50 --- setup.cfg | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/setup.cfg b/setup.cfg index 60bb79db450..4d0a6563b92 100644 --- a/setup.cfg +++ b/setup.cfg @@ -93,16 +93,12 @@ nova.scheduler.driver = fake_scheduler = nova.tests.unit.scheduler.fakes:FakeScheduler [build_sphinx] -all_files = 1 +builder = html man +all-files = 1 build-dir = doc/build source-dir = doc/source warning-is-error = 1 -[build_apiguide] -all_files = 1 -build-dir = api-guide/build -source-dir = api-guide/source - [egg_info] tag_build = tag_date = 0