From 18058105fb6116cf3ce33b3e4424322badd370a3 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 6 Oct 2015 19:48:29 +0200 Subject: [PATCH] Update for openstackdocstheme 1.2.3 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 --- firstapp/source/conf.py | 4 +--- test-requirements.txt | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/firstapp/source/conf.py b/firstapp/source/conf.py index 1f26f1e29..e1f989638 100644 --- a/firstapp/source/conf.py +++ b/firstapp/source/conf.py @@ -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 diff --git a/test-requirements.txt b/test-requirements.txt index 69b2c312c..9c353746f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -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