Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/sphinxSysPath into lp:ubuntu-ui-toolkit/staging

Proposed by Cris Dywan
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1451
Merged at revision: 1458
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/sphinxSysPath
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 23 lines (+2/-1)
2 files modified
debian/control (+1/-0)
documentation/autopilot-helpers/conf.py (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/sphinxSysPath
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zoltan Balogh Approve
Review via email: mp+252891@code.launchpad.net

Commit message

    Add tests/autopilot to sys.path of sphinx config

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Zoltan Balogh (bzoltan) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Autolanding job http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/860/ failed due to loss of the build slaves. Please re-approve to retry the autolanding.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-03-02 13:55:42 +0000
3+++ debian/control 2015-03-24 10:24:59 +0000
4@@ -47,6 +47,7 @@
5 locales,
6 suru-icon-theme,
7 uuid-runtime,
8+ python-autopilot (>= 1.4),
9 python3-sphinx,
10 Standards-Version: 3.9.4
11 Homepage: https://launchpad.net/ubuntu-ui-toolkit
12
13=== modified file 'documentation/autopilot-helpers/conf.py'
14--- documentation/autopilot-helpers/conf.py 2015-01-26 16:22:07 +0000
15+++ documentation/autopilot-helpers/conf.py 2015-03-24 10:24:59 +0000
16@@ -19,7 +19,7 @@
17 # If extensions (or modules to document with autodoc) are in another directory,
18 # add these directories to sys.path here. If the directory is relative to the
19 # documentation root, use os.path.abspath to make it absolute, like shown here.
20-# sys.path.insert(0, os.path.abspath('.'))
21+sys.path.insert(0, os.path.join(os.path.abspath('../..'), 'tests/autopilot/'))
22
23 # -- General configuration ------------------------------------------------
24

Subscribers

People subscribed via source and target branches