opendev/infra-manual
Code Issues Proposed changes

Merge "Update python files for OpenDev"

Browse Source
This commit is contained in:
Zuul 2020-03-05 15:24:13 +00:00 committed by Gerrit Code Review
commit bd54006314
4 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
doc/source/conf.py
View File

@ -24,11 +24,11 @@ todo_include_todos = True
master_doc = 'index' master_doc = 'index'
# General information about the project. # General information about the project.
project = u'OpenStack Project Infrastructure Manual' project = u'OpenDev Manual'
copyright = ('%d, OpenStack Contributors.' % datetime.date.today().year) copyright = ('%d, OpenDev Contributors.' % datetime.date.today().year)
# openstackdocstheme options # openstackdocstheme options
repository_name = 'openstack-infra/infra-manual' repository_name = 'openstack/infra-manual'
bug_project = '721' bug_project = '721'
bug_tag = '' bug_tag = ''
@ -64,9 +64,6 @@ man_pages = []
# a list of builtin themes. # a list of builtin themes.
html_theme = 'openstackdocs' html_theme = 'openstackdocs'
# Must set this variable to include year, month, day, hours, and minutes.
html_last_updated_fmt = '%Y-%m-%d %H:%M'
# If false, no module index is generated. # If false, no module index is generated.
html_domain_indices = False html_domain_indices = False
@ -80,7 +77,7 @@ html_use_index = False
# (source start file, target name, title, author, documentclass [howto/manual]). # (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [ latex_documents = [
('index', 'Infra-manual.tex', u'Infra Manual', ('index', 'Infra-manual.tex', u'Infra Manual',
u'OpenStack Contributors', 'manual'), u'OpenDev Contributors', 'manual'),
] ]
@ -91,7 +88,7 @@ latex_documents = [
# dir menu entry, description, category) # dir menu entry, description, category)
texinfo_documents = [ texinfo_documents = [
('index', 'Infra-manual', u'Infra Manual', ('index', 'Infra-manual', u'Infra Manual',
u'OpenStack Contributors', 'infra-manual', 'OpenStack Project Infrastructure Manual.', u'OpenDev Contributors', 'infra-manual', 'OpenDev Manual.',
'Miscellaneous'), 'Miscellaneous'),
] ]
@ -99,7 +96,7 @@ texinfo_documents = [
# -- Options for Epub output --------------------------------------------------- # -- Options for Epub output ---------------------------------------------------
# Bibliographic Dublin Core info. # Bibliographic Dublin Core info.
epub_title = u'OpenStack Project Infrastructure Manual' epub_title = u'OpenDev Manual'
epub_author = u'OpenStack Contributors' epub_author = u'OpenDev Contributors'
epub_publisher = u'OpenStack Contributors' epub_publisher = u'OpenDev Contributors'
epub_copyright = u'%s, OpenStack Contributors' % datetime.date.today().year epub_copyright = u'%s, OpenDev Contributors' % datetime.date.today().year

2
requirements.txt
View File

@ -2,5 +2,5 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
pbr>=2.0.0,!=2.1.0 # Apache-2.0 pbr>=2.0.0,!=2.1.0 # Apache-2.0
openstackdocstheme>=1.17.0 # Apache-2.0 openstackdocstheme>=1.32.1 # Apache-2.0
sphinx>=1.6.2 # BSD sphinx>=1.6.2 # BSD

15
setup.cfg
View File

@ -1,21 +1,12 @@
[metadata] [metadata]
name = infra-manual name = infra-manual
summary = OpenStack Project Infrastructure Manual summary = OpenDev Manual
description-file = description-file =
README.rst README.rst
author = OpenStack author = OpenDev
author-email = openstack-infra@lists.openstack.org author-email = openstack-infra@lists.openstack.org
home-page = http://www.openstack.org/ home-page = http://www.opendev.org/
classifier = classifier =
Intended Audience :: Developers Intended Audience :: Developers
License :: OSI Approved :: Apache Software License License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux Operating System :: POSIX :: Linux
[build_sphinx]
all_files = 1
build-dir = doc/build
source-dir = doc/source
warning-is-error = 1
[wheel]
universal = 1

10
setup.py
View File

@ -16,14 +16,6 @@
import setuptools import setuptools
# In python < 2.7.4, a lazy loading of package `pbr` will break
# setuptools if some other modules registered functions in `atexit`.
# solution from: http://bugs.python.org/issue15881#msg170215
try:
import multiprocessing # noqa
except ImportError:
pass
setuptools.setup( setuptools.setup(
setup_requires=['pbr>=1.8'], setup_requires=['pbr>=2.0.0'],
pbr=True) pbr=True)