Cleanup py27 support

Make a few cleanups:
- Remove obsolete sections from setup.cfg
- Switch to using sphinx-build
- Cleanup doc/source/conf.py to remove now obsolete content.
- Use newer openstackdocstheme version
- Remove install_command from tox.ini, the default is fine

Change-Id: I8582f554fa966d9e9b9e260918db84dcc02041b7
This commit is contained in:
Andreas Jaeger 2020-04-10 11:51:49 +02:00
parent c23d1ce7e3
commit ac82cef15a
4 changed files with 4 additions and 19 deletions

View File

@ -13,16 +13,12 @@
# limitations under the License. # limitations under the License.
import datetime import datetime
import os
import sys
sys.path.insert(0, os.path.abspath('../..'))
# -- General configuration ---------------------------------------------------- # -- General configuration ----------------------------------------------------
# Add any Sphinx extension module names here, as strings. They can be # Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = [ extensions = [
'sphinx.ext.autodoc',
#'sphinx.ext.intersphinx', #'sphinx.ext.intersphinx',
'openstackdocstheme', 'openstackdocstheme',
'yasfb', 'yasfb',
@ -52,7 +48,7 @@ project = u'telemetry-specs'
copyright = u'%s, OpenStack Foundation' % datetime.date.today().year copyright = u'%s, OpenStack Foundation' % datetime.date.today().year
# openstackdocstheme options # openstackdocstheme options
repository_name = 'openstack/python-glanceclient' repository_name = 'openstack/telemetry-specs'
use_storyboard = True use_storyboard = True
html_theme = 'openstackdocs' html_theme = 'openstackdocs'

View File

@ -1,6 +1,6 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0 pbr!=2.1.0,>=2.0.0 # Apache-2.0
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.5 # BSD sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.5 # BSD
openstackdocstheme>=1.22 openstackdocstheme>=1.32.1
testrepository>=0.0.18 testrepository>=0.0.18
testtools>=0.9.34 testtools>=0.9.34
yasfb>=0.5.1 yasfb>=0.5.1

View File

@ -10,14 +10,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 = 1
[pbr]
warnerrors = True
[wheel]
universal = 1

View File

@ -8,7 +8,6 @@ ignore_basepython_conflict = True
basepython = python3 basepython = python3
usedevelop = True usedevelop = True
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
install_command = pip install -U {opts} {packages}
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
# NOTE(tonyb): This project has chosen to *NOT* consume upper-constraints.txt # NOTE(tonyb): This project has chosen to *NOT* consume upper-constraints.txt
commands = python setup.py testr --slowest --testr-args='{posargs}' commands = python setup.py testr --slowest --testr-args='{posargs}'
@ -17,4 +16,5 @@ commands = python setup.py testr --slowest --testr-args='{posargs}'
commands = {posargs} commands = {posargs}
[testenv:docs] [testenv:docs]
commands = python setup.py build_sphinx commands =
sphinx-build -W -b html doc/source doc/build/html