summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhang.lei <zhang.lei@99cloud.net>2018-01-15 02:25:49 +0000
committerzhang.lei <zhang.lei@99cloud.net>2018-01-15 02:25:49 +0000
commite49f7089cb7a98833278baa2a1760b2d4c7f5e24 (patch)
tree72e21c646a9fadc81abcd1b160239d098348d670
parentae6f721dc0342e1e7b45ff2448ab51f7539dc01f (diff)
Remove the deprecated "giturl" option
From openstackdocstheme 1.18.0, valid Git URLs can be retrieved by openstackdocstheme[1], we do not need giturl option anymore. [1] https://review.openstack.org/532163 Change-Id: If4189b08a126f5ee8c513992487fccc08b8871dc
Notes
Notes (review): Code-Review+1: Dai Dang Van <daidv@vn.fujitsu.com> Code-Review+2: Major Hayden <major@mhtx.net> Code-Review+2: Kevin Carter (cloudnull) <kevin@cloudnull.com> Workflow+1: Kevin Carter (cloudnull) <kevin@cloudnull.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 24 Jan 2018 05:32:15 +0000 Reviewed-on: https://review.openstack.org/533451 Project: openstack/openstack-ansible-memcached_server Branch: refs/heads/master
-rw-r--r--doc/source/conf.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 5957d33..29af839 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -86,20 +86,16 @@ release = version_info.version_string_with_vcs()
86version = version_info.canonical_version_string() 86version = version_info.canonical_version_string()
87 87
88# A few variables have to be set for the log-a-bug feature. 88# A few variables have to be set for the log-a-bug feature.
89# giturl: The location of conf.py on Git. Must be set manually.
90# gitsha: The SHA checksum of the bug description. 89# gitsha: The SHA checksum of the bug description.
91# Automatically extracted from git log. 90# Automatically extracted from git log.
92# bug_tag: Tag for categorizing the bug. Must be set manually. 91# bug_tag: Tag for categorizing the bug. Must be set manually.
93# These variables are passed to the logabug code via html_context. 92# These variables are passed to the logabug code via html_context.
94giturl = ("https://git.openstack.org/cgit/openstack/{0}"
95 "/tree/doc/source").format(target_name)
96git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '" 93git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '"
97gitsha = os.popen(git_cmd).read().strip('\n') 94gitsha = os.popen(git_cmd).read().strip('\n')
98bug_project = project.lower() 95bug_project = project.lower()
99bug_title = "Documentation bug" 96bug_title = "Documentation bug"
100html_context = {"gitsha": gitsha, "giturl": giturl, 97html_context = {"gitsha": gitsha, "bug_tag": "docs",
101 "bug_tag": "docs", "bug_title": bug_title, 98 "bug_title": bug_title, "bug_project": bug_project}
102 "bug_project": bug_project}
103 99
104# The language for content autogenerated by Sphinx. Refer to documentation 100# The language for content autogenerated by Sphinx. Refer to documentation
105# for a list of supported languages. 101# for a list of supported languages.