Cleanup docs building
This repo is now testing only with Python 3, so let's make a few cleanups: - Remove obsolete sections from setup.cfg - Switch to using sphinx-build - Remove install_command from tox.ini, the default is fine - cleanup tox.ini - Update pbr requirement Change-Id: I0adc74190fa820434a46b2a6bf9247ca6eb3e51d
This commit is contained in:
parent
eb7c979999
commit
188a3338f7
@ -1,4 +1,4 @@
|
|||||||
pbr>=0.6,!=0.7,<1.0
|
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||||
sphinx>=2.0.0,!=2.1.0 # BSD
|
sphinx>=2.0.0,!=2.1.0 # BSD
|
||||||
openstackdocstheme>=2.2.1 # Apache-2.0
|
openstackdocstheme>=2.2.1 # Apache-2.0
|
||||||
yasfb>=0.5.1
|
yasfb>=0.5.1
|
||||||
|
12
setup.cfg
12
setup.cfg
@ -11,15 +11,3 @@ 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]
|
|
||||||
source-dir = doc/source
|
|
||||||
build-dir = doc/build
|
|
||||||
all-files = True
|
|
||||||
warning-is-error = True
|
|
||||||
|
|
||||||
[pbr]
|
|
||||||
warnerrors = True
|
|
||||||
|
|
||||||
[upload_sphinx]
|
|
||||||
upload-dir = doc/build/html
|
|
||||||
|
6
tox.ini
6
tox.ini
@ -5,19 +5,17 @@ skipsdist = True
|
|||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -U {opts} {packages}
|
basepython = python3
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
basepython = python3
|
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
basepython = python3
|
commands = sphinx-build -W -b html doc/source doc/build/html
|
||||||
commands = python setup.py build_sphinx
|
|
||||||
|
|
||||||
[testenv:spelling]
|
[testenv:spelling]
|
||||||
deps =
|
deps =
|
||||||
|
Loading…
Reference in New Issue
Block a user