From f6408cb0761f555864f2885a9c0da77d0f6666f8 Mon Sep 17 00:00:00 2001 From: Mathieu Mitchell Date: Wed, 31 Aug 2016 08:58:17 -0400 Subject: [PATCH] Use repo_name as literal in bug_project Additionally, fix E501 line too long violations in configuration file. This should help smoothen inclusion in projects where such checks are applied. Note that the giturl line uses the noqa tag instead of the multi-line approach. I find that it reads better that way. Change-Id: I0d06f2bf85ce6b28d7bef04ad20fe64f575cc0f6 --- {{cookiecutter.repo_name}}/install-guide/source/conf.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.repo_name}}/install-guide/source/conf.py b/{{cookiecutter.repo_name}}/install-guide/source/conf.py index 2b7f6fe..727d4ac 100644 --- a/{{cookiecutter.repo_name}}/install-guide/source/conf.py +++ b/{{cookiecutter.repo_name}}/install-guide/source/conf.py @@ -70,15 +70,16 @@ release = '0.1' # A few variables have to be set for the log-a-bug feature. # 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. +# gitsha: The SHA checksum of the bug description. Automatically extracted +# from git log. # bug_tag: Tag for categorizing the bug. Must be set manually. # These variables are passed to the logabug code via html_context. -giturl = u'http://git.openstack.org/cgit/openstack/{{cookiecutter.codename}}/tree/install-guide/source' +giturl = u'http://git.openstack.org/cgit/openstack/{{cookiecutter.codename}}/tree/install-guide/source' # noqa git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '" gitsha = os.popen(git_cmd).read().strip('\n') html_context = {"gitsha": gitsha, "bug_tag": bug_tag, "giturl": giturl, - "bug_project": {{cookiecutter.codename}}} + "bug_project": "{{cookiecutter.codename}}"} # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.