Update docs building
Update docs building: * Switch to sphinx-build, fix build problem * Update requirements for Sphinx and openstackdocstheme for python 3 * Remove unneeded doc sections from setup.cfg Change-Id: Ib36a271e9a8704f96920bb00573775fb22f33f08
This commit is contained in:
parent
75baf20398
commit
66336d5c59
|
@ -1,4 +1,3 @@
|
||||||
sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD
|
sphinx>=2.0.0,!=2.1.0 # BSD
|
||||||
sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
|
openstackdocstheme>=2.0.0 # Apache-2.0
|
||||||
openstackdocstheme>=1.30.0 # Apache-2.0
|
|
||||||
texttable
|
texttable
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
.. _node-configuration:
|
.. _getting_started:
|
||||||
|
|
||||||
Getting started with TripleO-Quickstart
|
Getting started with TripleO-Quickstart
|
||||||
=======================================
|
=======================================
|
||||||
|
|
12
setup.cfg
12
setup.cfg
|
@ -14,15 +14,6 @@ classifier =
|
||||||
Intended Audience :: Information Technology
|
Intended Audience :: Information Technology
|
||||||
Topic :: Utilities
|
Topic :: Utilities
|
||||||
|
|
||||||
[build_sphinx]
|
|
||||||
all_files = 1
|
|
||||||
build-dir = doc/build
|
|
||||||
source-dir = doc/source
|
|
||||||
|
|
||||||
[global]
|
|
||||||
setup-hooks =
|
|
||||||
pbr.hooks.setup_hook
|
|
||||||
|
|
||||||
[files]
|
[files]
|
||||||
data_files =
|
data_files =
|
||||||
usr/local/share/tripleo-quickstart/roles = roles/*
|
usr/local/share/tripleo-quickstart/roles = roles/*
|
||||||
|
@ -31,9 +22,6 @@ data_files =
|
||||||
playbooks = playbooks/*
|
playbooks = playbooks/*
|
||||||
config/ = config/*
|
config/ = config/*
|
||||||
|
|
||||||
[wheel]
|
|
||||||
universal = 1
|
|
||||||
|
|
||||||
[pbr]
|
[pbr]
|
||||||
skip_authors = True
|
skip_authors = True
|
||||||
skip_changelog = True
|
skip_changelog = True
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
openstackdocstheme>=1.11.0 # Apache-2.0
|
openstackdocstheme>=2.0.0 # Apache-2.0
|
||||||
|
|
||||||
docutils>=0.11
|
docutils>=0.11
|
||||||
sphinx>=1.6.2 # BSD
|
sphinx>=2.0.0,!=2.1.0 # BSD
|
||||||
reno>=1.8.0 # Apache-2.0
|
reno>=1.8.0 # Apache-2.0
|
||||||
pre-commit # MIT
|
pre-commit # MIT
|
||||||
texttable
|
texttable
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -49,7 +49,7 @@ basepython = python3
|
||||||
deps = -r{toxinidir}/doc/requirements.txt
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
commands =
|
commands =
|
||||||
bash -c 'python fs-matrix.py > doc/source/feature-configuration-generated.rst'
|
bash -c 'python fs-matrix.py > doc/source/feature-configuration-generated.rst'
|
||||||
python setup.py build_sphinx
|
sphinx-build -W -b html doc/source doc/build/html
|
||||||
|
|
||||||
[testenv:bashate]
|
[testenv:bashate]
|
||||||
envdir = {toxworkdir}/linters
|
envdir = {toxworkdir}/linters
|
||||||
|
|
Loading…
Reference in New Issue