UTAH

Merge ~paride/utah/+git/utah:use-py2-sphinx into utah:master

  1. Git
  2. lp:~paride/utah/+git/utah
  3. use-py2-sphinx
  4. Merge into master
Proposed by Paride Legovini
Status: Merged
Merged at revision: cf1a7fdf08407cd07966ea0937650664dd10187a
Proposed branch: ~paride/utah/+git/utah:use-py2-sphinx
Merge into: utah:master
Diff against target: 12 lines (+1/-1)
1 file modified
docs/Makefile (+1/-1)
Reviewer Review Type Date Requested Status
UTAH Dev Pending
Review via email: mp+375439@code.launchpad.net

Commit message

Explicitly call sphinx-build from python-sphinx

The sphinx configuration file is not compatible with python3-sphinx.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/docs/Makefile b/docs/Makefile
2index 04b4a92..502e926 100644
3--- a/docs/Makefile
4+++ b/docs/Makefile
5@@ -3,7 +3,7 @@
6
7 # You can set these variables from the command line.
8 SPHINXOPTS =
9-SPHINXBUILD = sphinx-build
10+SPHINXBUILD = /usr/share/sphinx/scripts/python2/sphinx-build
11 PAPER =
12 BUILDDIR = build
13

Subscribers

People subscribed via source and target branches