summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Danjou <julien@danjou.info>2017-05-17 12:05:59 +0200
committerJulien Danjou <julien@danjou.info>2017-05-17 12:11:18 +0200
commitc02406601a7d7c453c77318ff5b5af6d760e80ae (patch)
treea5af33f9e66caf7fc0eccd80b2471c966baa032c
parent12a1c1dc3ca2df77f5626e75b9a8889fc98d4366 (diff)
builddoc: uses the new Sphinx 1.6 code for multiple builder3.0.1
As noted by stephenfin, Sphinx 1.6 provides its own code to build doc with multiple builders. The one provided by pbr so far for Sphinx < 1.6 is not even compatible with 1.6. This patch fixes that by running the native Sphinx code for Sphinx > 1.6 and falling back to the old code for older Sphinx versions. Closes-Bug: #1691129 Change-Id: I5224235b1056a248b246c54e2d99eea94d53c4eb
Notes
Notes (review): Code-Review+1: Bogdan Dobrelya <bdobreli@redhat.com> Code-Review+2: Stephen Finucane <sfinucan@redhat.com> Code-Review+1: Akihiro Motoki <amotoki@gmail.com> Code-Review+1: Lance Bragstad <lbragstad@gmail.com> Code-Review+2: Davanum Srinivas (dims) <davanum@gmail.com> Workflow+1: Davanum Srinivas (dims) <davanum@gmail.com> Code-Review+1: Gage Hugo <gagehugo@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 17 May 2017 17:03:47 +0000 Reviewed-on: https://review.openstack.org/465489 Project: openstack-dev/pbr Branch: refs/heads/master
-rw-r--r--pbr/builddoc.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/pbr/builddoc.py b/pbr/builddoc.py
index 45e782a..1d31502 100644
--- a/pbr/builddoc.py
+++ b/pbr/builddoc.py
@@ -186,6 +186,11 @@ class LocalBuildDoc(setup_command.BuildDoc):
186 # TODO(stephenfin): Deprecate this functionality once we depend on 186 # TODO(stephenfin): Deprecate this functionality once we depend on
187 # Sphinx 1.6, which includes a similar feature, in g-r 187 # Sphinx 1.6, which includes a similar feature, in g-r
188 # https://github.com/sphinx-doc/sphinx/pull/3476 188 # https://github.com/sphinx-doc/sphinx/pull/3476
189 self.finalize_options()
190 if hasattr(self, "builder_target_dirs"):
191 # Sphinx >= 1.6.1
192 return setup_command.BuildDoc.run(self)
193 # Sphinx < 1.6
189 for builder in self.builders: 194 for builder in self.builders:
190 self.builder = builder 195 self.builder = builder
191 self.finalize_options() 196 self.finalize_options()