openstack
/
cookiecutter
Code Issues Proposed changes

Fix errors found from making a project 

The pbr version is tied to the repo-name - that is, the name that we
register with PyPI. It takes the argument 'python-novaclient' not
'novaclient'.

Nothing we do is Copyright OpenStack Foundation. There isn't a good
answer for a single-line copyright statement such as is found in sphinx
config files, but "OpenStack Foundation" is definitely wrong.

Add some line wrapping so that the releasenotes conf file doesn't fail
pep8.

Change-Id: Id237331c279b7acb848a28d167ad88d63de6f140
This commit is contained in:
Monty Taylor 2017-07-10 14:44:56 -05:00
parent 622da75739
commit 87d312127f
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
{{cookiecutter.repo_name}}/doc/source/conf.py
View File

@ -38,10 +38,10 @@ master_doc = 'index'
# General information about the project.
project = u'{{cookiecutter.repo_name}}'
copyright = u'2017, OpenStack Foundation'
copyright = u'2017, OpenStack Developers'
# openstackdocstheme options
repository_name = '{{cookiecutter.repo_group}}/{cookiecutter.repo_name}}'
repository_name = '{{cookiecutter.repo_group}}/{{cookiecutter.repo_name}}'
bug_project = '{{cookiecutter.launchpad_project}}'
bug_tag = ''
@ -74,7 +74,7 @@ latex_documents = [
('index',
'%s.tex' % project,
u'%s Documentation' % project,
u'OpenStack Foundation', 'manual'),
u'OpenStack Developers', 'manual'),
]
# Example configuration for intersphinx: refer to the Python standard library.

10
{{cookiecutter.repo_name}}/releasenotes/source/conf.py
View File

@ -53,10 +53,10 @@ master_doc = 'index'
# General information about the project.
project = u'{{cookiecutter.module_name}} Release Notes'
copyright = u'2016, OpenStack Foundation'
copyright = u'2017, OpenStack Developers'
# openstackdocstheme options
repository_name = '{{cookiecutter.repo_group}}/{cookiecutter.repo_name}}'
repository_name = '{{cookiecutter.repo_group}}/{{cookiecutter.repo_name}}'
bug_project = '{{cookiecutter.launchpad_project}}'
bug_tag = ''
@ -211,7 +211,8 @@ latex_elements = {
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
('index', '{{cookiecutter.module_name}}ReleaseNotes.tex', u'{{cookiecutter.module_name}} Release Notes Documentation',
('index', '{{cookiecutter.module_name}}ReleaseNotes.tex',
u'{{cookiecutter.module_name}} Release Notes Documentation',
u'OpenStack Foundation', 'manual'),
]
@ -241,7 +242,8 @@ latex_documents = [
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', '{{cookiecutter.module_name}}rereleasenotes', u'{{cookiecutter.module_name}} Release Notes Documentation',
('index', '{{cookiecutter.module_name}}rereleasenotes',
u'{{cookiecutter.module_name}} Release Notes Documentation',
[u'OpenStack Foundation'], 1)
]

2
{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/__init__.py
View File

@ -16,4 +16,4 @@ import pbr.version
__version__ = pbr.version.VersionInfo(
'{{cookiecutter.module_name}}').version_string()
'{{cookiecutter.repo_name}}').version_string()