Merge "do not require installing demo app to build docs"

This commit is contained in:
Zuul 2017-12-04 01:25:41 +00:00 committed by Gerrit Code Review
commit 1b037aee0f
3 changed files with 21 additions and 2 deletions

View File

@ -13,7 +13,9 @@
# serve to show the default.
import datetime
import os.path
import subprocess
import sys
# make openstackdocstheme an optional dependency. cliff is a low level lib
# that is used outside of OpenStack. Not having something OpenStack specific
@ -28,7 +30,10 @@ else:
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
# sys.path.insert(0, os.path.abspath('.'))
# NOTE(dhellmann): Add the demoapp directory to the import path so the
# directive for documenting the app can find the modules.
sys.path.insert(0, os.path.abspath('../../demoapp'))
# -- General configuration ---------------------------------------------------

View File

@ -50,6 +50,21 @@ cliff.formatter.completion =
bash = cliff.complete:CompleteBash
none = cliff.complete:CompleteNoCode
# NOTE(dhellmann): Duplicated from demoapp/setup.py for the
# documentation build.
cliff.demo =
simple = cliffdemo.simple:Simple
two_part = cliffdemo.simple:Simple
error = cliffdemo.simple:Error
list files = cliffdemo.list:Files
files = cliffdemo.list:Files
file = cliffdemo.show:File
show file = cliffdemo.show:File
unicode = cliffdemo.encoding:Encoding
hooked = cliffdemo.hook:Hooked
cliff.demo.hooked =
sample-hook = cliffdemo.hook:Hook
[build_sphinx]
all-files = 1

View File

@ -19,7 +19,6 @@ commands =
coverage report --show-missing
deps =
-r{toxinidir}/test-requirements.txt
{toxinidir}/demoapp
.[docs]
[testenv:pep8]