Update docs building
Update docs building: * Switch to sphinx-build * Update requirements for Sphinx and openstackdocstheme for python 3 * Remove unneeded doc and translation sections from setup.cfg * Remove install_command, it's unneeded, the default is fine. Change-Id: I91b3d395f980f9aa55e4c6134b821efec4450643
This commit is contained in:
parent
8e9beccc22
commit
83eac6f6d9
@ -41,7 +41,7 @@ project = u'openstack'
|
|||||||
copyright = u'2017, OpenStack Developers'
|
copyright = u'2017, OpenStack Developers'
|
||||||
|
|
||||||
# openstackdocstheme options
|
# openstackdocstheme options
|
||||||
repository_name = 'openstack/openstack'
|
repository_name = 'openstack/vitrage-tempest-plugin'
|
||||||
use_storyboard = True
|
use_storyboard = True
|
||||||
|
|
||||||
# If true, '()' will be appended to :func: etc. cross-reference text.
|
# If true, '()' will be appended to :func: etc. cross-reference text.
|
||||||
|
23
setup.cfg
23
setup.cfg
@ -24,26 +24,3 @@ packages =
|
|||||||
[entry_points]
|
[entry_points]
|
||||||
tempest.test_plugins =
|
tempest.test_plugins =
|
||||||
vitrage_tests = vitrage_tempest_plugin.plugin:VitrageTempestPlugin
|
vitrage_tests = vitrage_tempest_plugin.plugin:VitrageTempestPlugin
|
||||||
|
|
||||||
[build_sphinx]
|
|
||||||
all-files = 1
|
|
||||||
warning-is-error = 1
|
|
||||||
source-dir = doc/source
|
|
||||||
build-dir = doc/build
|
|
||||||
|
|
||||||
[upload_sphinx]
|
|
||||||
upload-dir = doc/build/html
|
|
||||||
|
|
||||||
[compile_catalog]
|
|
||||||
directory = vitrage_tempest_plugin/locale
|
|
||||||
domain = vitrage_tempest_plugin
|
|
||||||
|
|
||||||
[update_catalog]
|
|
||||||
domain = vitrage_tempest_plugin
|
|
||||||
output_dir = vitrage_tempest_plugin/locale
|
|
||||||
input_file = vitrage_tempest_plugin/locale/vitrage_tempest_plugin.pot
|
|
||||||
|
|
||||||
[extract_messages]
|
|
||||||
keywords = _ gettext ngettext l_ lazy_gettext
|
|
||||||
mapping_file = babel.cfg
|
|
||||||
output_file = vitrage_tempest_plugin/locale/vitrage_tempest_plugin.pot
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
hacking>=3.0,<3.1.0;python_version>='3.5' # Apache-2.0
|
hacking>=3.0,<3.1.0;python_version>='3.5' # Apache-2.0
|
||||||
hacking>=1.1.0,<1.2.0;python_version=='2.7' # Apache-2.0
|
hacking>=1.1.0,<1.2.0;python_version=='2.7' # Apache-2.0
|
||||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
|
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
|
||||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
|
sphinx>=2.0.0,!=2.1.0;python_version>='3.4' # BSD
|
||||||
openstackdocstheme>=1.24.0 # Apache-2.0
|
openstackdocstheme>=1.31.2 # Apache-2.0
|
||||||
# releasenotes
|
# releasenotes
|
||||||
reno>=2.5.0 # Apache-2.0
|
reno>=2.5.0 # Apache-2.0
|
||||||
|
7
tox.ini
7
tox.ini
@ -7,14 +7,15 @@ ignore_basepython_conflict = True
|
|||||||
[testenv]
|
[testenv]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages}
|
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
PYTHONWARNINGS=default::DeprecationWarning
|
PYTHONWARNINGS=default::DeprecationWarning
|
||||||
OS_STDOUT_CAPTURE=1
|
OS_STDOUT_CAPTURE=1
|
||||||
OS_STDERR_CAPTURE=1
|
OS_STDERR_CAPTURE=1
|
||||||
OS_TEST_TIMEOUT=60
|
OS_TEST_TIMEOUT=60
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps =
|
||||||
|
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||||
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = stestr run {posargs}
|
commands = stestr run {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
@ -34,7 +35,7 @@ commands =
|
|||||||
coverage xml -o cover/coverage.xml
|
coverage xml -o cover/coverage.xml
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
commands = python setup.py build_sphinx
|
commands = sphinx-build -W -b html doc/source doc/build/html
|
||||||
|
|
||||||
[testenv:releasenotes]
|
[testenv:releasenotes]
|
||||||
commands =
|
commands =
|
||||||
|
Loading…
Reference in New Issue
Block a user