summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhang.lei <zhang.lei@99cloud.net>2018-01-15 02:29:05 +0000
committerzhang.lei <zhang.lei@99cloud.net>2018-01-15 02:29:05 +0000
commitede3c8e20038274e859ca82aa269ca1f0b227c45 (patch)
tree759a10c80bac77a0512182d4aa42f9712ae570fb
parent4eeffab026564f15390f8d661ef66703f4004c56 (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: Idef3f2269f0cc838bd75c44525798f9edd467997
Notes
Notes (review): Code-Review+1: Dai Dang Van <daidv@vn.fujitsu.com> Code-Review+2: Major Hayden <major@mhtx.net> Code-Review+2: Jean-Philippe Evrard <jean-philippe@evrard.me> Workflow+1: Jean-Philippe Evrard <jean-philippe@evrard.me> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 19 Feb 2018 13:06:34 +0000 Reviewed-on: https://review.openstack.org/533452 Project: openstack/monitorstack 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 0a74965..1cfac34 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -83,20 +83,16 @@ release = version_info.version_string_with_vcs()
83version = version_info.canonical_version_string() 83version = version_info.canonical_version_string()
84 84
85# A few variables have to be set for the log-a-bug feature. 85# A few variables have to be set for the log-a-bug feature.
86# giturl: The location of conf.py on Git. Must be set manually.
87# gitsha: The SHA checksum of the bug description. 86# gitsha: The SHA checksum of the bug description.
88# Automatically extracted from git log. 87# Automatically extracted from git log.
89# bug_tag: Tag for categorizing the bug. Must be set manually. 88# bug_tag: Tag for categorizing the bug. Must be set manually.
90# These variables are passed to the logabug code via html_context. 89# These variables are passed to the logabug code via html_context.
91giturl = ("http://git.openstack.org/cgit/openstack/{0}"
92 "/tree/doc/source").format(project)
93git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '" 90git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '"
94gitsha = os.popen(git_cmd).read().strip('\n') 91gitsha = os.popen(git_cmd).read().strip('\n')
95bug_project = project.lower() 92bug_project = project.lower()
96bug_title = "Documentation bug" 93bug_title = "Documentation bug"
97html_context = {"gitsha": gitsha, "giturl": giturl, 94html_context = {"gitsha": gitsha, "bug_tag": "docs",
98 "bug_tag": "docs", "bug_title": bug_title, 95 "bug_title": bug_title, "bug_project": bug_project}
99 "bug_project": bug_project}
100 96
101# The language for content autogenerated by Sphinx. Refer to documentation 97# The language for content autogenerated by Sphinx. Refer to documentation
102# for a list of supported languages. 98# for a list of supported languages.