Merge lp:~dobey/autopilot/fix-sphinx into lp:autopilot/legacy

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 501
Merged at revision: 502
Proposed branch: lp:~dobey/autopilot/fix-sphinx
Merge into: lp:autopilot/legacy
Diff against target: 44 lines (+4/-7)
3 files modified
debian/rules (+1/-1)
docs/conf.py (+1/-1)
docs/otto.py (+2/-5)
To merge this branch: bzr merge lp:~dobey/autopilot/fix-sphinx
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+318970@code.launchpad.net

Commit message

Replace sphinx pngmath with imgmath.

To post a comment you must log in.
lp:~dobey/autopilot/fix-sphinx updated
501. By dobey

Update docs/otto.py to match trunk autopilot.
Don't treat warnings as errors in sphinx.

Revision history for this message
dobey (dobey) wrote :

Self approving because this is necessary to unblock migration, and allows docs to build on zesty.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2014-08-06 05:50:43 +0000
3+++ debian/rules 2017-03-04 20:06:07 +0000
4@@ -12,7 +12,7 @@
5 rm -rf build
6
7 override_dh_auto_build:
8- sphinx-build -b html -W docs/ docs/_build/html/
9+ sphinx-build -b html docs/ docs/_build/html/
10 dh_auto_build
11
12 override_dh_auto_test:
13
14=== modified file 'docs/conf.py'
15--- docs/conf.py 2013-10-14 21:01:33 +0000
16+++ docs/conf.py 2017-03-04 20:06:07 +0000
17@@ -46,7 +46,7 @@
18 extensions = [
19 'sphinx.ext.autodoc',
20 'sphinx.ext.graphviz',
21- 'sphinx.ext.pngmath',
22+ 'sphinx.ext.imgmath',
23 'sphinx.ext.viewcode',
24 'otto',
25 ]
26
27=== modified file 'docs/otto.py'
28--- docs/otto.py 2013-07-25 05:47:36 +0000
29+++ docs/otto.py 2017-03-04 20:06:07 +0000
30@@ -56,12 +56,9 @@
31 self.content, self.lineno, self.content_offset,
32 self.block_text, self.state, self.state_machine)
33 image_container = nodes.container()
34- image_container.children.append(nodes.image(uri='/images/otto-64.png'))
35+ image_container.append(nodes.image(uri='/images/otto-64.png'))
36 image_container['classes'] = ['otto-image-container']
37 outer_container = nodes.container()
38- outer_container.children.extend(
39- [image_container]
40- + ad
41- )
42+ outer_container.extend([image_container] + ad)
43 outer_container['classes'] = ['otto-says-container']
44 return [outer_container]

Subscribers

People subscribed via source and target branches

to all changes: