openstack/api-site
Code Issues Proposed changes

Update for openstackdocstheme 1.2.3

Browse Source 
Require new version and cleanup conf.py, we do no need pwd variable
anymore.

Sync pbr requirements with global requirements. Update
openstack-doc-tools requirements, we use 0.30 everywhere else.

Change-Id: I53a222445967092e08a1b598a19e8bbe71e378a6
This commit is contained in:
Andreas Jaeger 2015-10-06 19:48:29 +02:00
parent b42c8489f1
commit 18058105fb
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firstapp/source/conf.py
View File

@ -76,13 +76,11 @@ release = '0.1'
# giturl: The location of conf.py on Git. Must be set manually.
# gitsha: The SHA checksum of the bug description. Automatically extracted from git log.
# bug_tag: Tag for categorizing the bug. Must be set manually.
# pwd: source tree - this is needed only for openstackdocstheme <= 1.2.2
# These variables are passed to the logabug code via html_context.
giturl = u'http://git.openstack.org/cgit/openstack/api-site/tree/firstapp/source'
git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '"
gitsha = os.popen(git_cmd).read().strip('\n')
pwd = os.popen("pwd").read().strip('\n')
html_context = {"pwd": pwd, "gitsha": gitsha, "bug_tag": bug_tag,
html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
"giturl": giturl}
# The language for content autogenerated by Sphinx. Refer to documentation

6
test-requirements.txt
View File

@ -1,13 +1,13 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr>=1.3,<2.0
openstack-doc-tools>=0.23
pbr>=1.6
openstack-doc-tools>=0.30
doc8 # Apache-2.0
Pygments
# At least 1.3 is required for dedent in code blocks. Capped to 1.3 to not get an automatic update to any newer versions.
sphinx>=1.3,!=1.3b1,<1.4
openstackdocstheme>=1.0.7
openstackdocstheme>=1.2.3
# NOTE(tonyb) Pillow isn't directly needed but it's pulled in via
# Collecting Pillow (from blockdiag>=1.5.0->nwdiag
# So cap as per global-requirements until https://launchpad.net/bugs/1501995