Cleanup py27 support and docs

Make a few cleanups:
- Remove obsolete sections from setup.cfg
- Use sphinx-build for building, fix problems found
- Cleanup tox.ini
- Use newer openstackdocstheme option, remove obsolete config

Change-Id: I7a3788858af70d4349d21dcf04907b42365985c1
This commit is contained in:
Andreas Jaeger 2020-04-09 11:48:40 +02:00
parent 878ff2190d
commit 62d775d17f
7 changed files with 17 additions and 25 deletions

View File

@ -125,11 +125,6 @@ man_pages = []
# pixels large. # pixels large.
#html_favicon = None #html_favicon = None
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
git_cmd = "git log --pretty=format:'%ad, commit %h' --date=local -n1"
html_last_updated_fmt = os.popen(git_cmd).read()
# If true, SmartyPants will be used to convert quotes and dashes to # If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities. # typographically correct entities.
#html_use_smartypants = True #html_use_smartypants = True

View File

@ -53,6 +53,14 @@ Pike specs:
specs/pike/approved/* specs/pike/approved/*
Queens specs:
.. toctree::
:glob:
:maxdepth: 1
specs/queens/approved/*
========================== ==========================
Murano apps Specifications Murano apps Specifications
========================== ==========================

View File

@ -3,8 +3,8 @@
# 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
sphinx>=1.5.1 # BSD sphinx>=1.6.1 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=1.4.0 # MIT testtools>=1.4.0 # MIT
yasfb>=0.8.0 yasfb>=0.8.0
openstackdocstheme>=1.19.0 # Apache-2.0 openstackdocstheme>=1.32.0 # Apache-2.0

View File

@ -10,15 +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]
builders = html
all_files = 1
build-dir = doc/build
source-dir = doc/source
[pbr]
warnerrors = True
[wheel]
universal = 1

View File

@ -161,7 +161,7 @@ Work Items
Dependencies Dependencies
============ ============
* Congress python client ( `GIT <https://opendev.org/openstack/python-congressclient`_ ) * Congress python client ( `GIT <https://opendev.org/openstack/python-congressclient>`_ )
will be added into Murano. will be added into Murano.
* *Murano datasource driver* in Congress `murano driver spec * *Murano datasource driver* in Congress `murano driver spec
<https://blueprints.launchpad.net/congress/+spec/murano-driver>`_ <https://blueprints.launchpad.net/congress/+spec/murano-driver>`_

View File

@ -192,7 +192,7 @@ Work Items
agent agent
6. Add stamp value to the messages 6. Add stamp value to the messages
7. Validate stamp value on the agent (including persistent tracking of the 7. Validate stamp value on the agent (including persistent tracking of the
previous stamp value) for both agents previous stamp value) for both agents
Dependencies Dependencies

View File

@ -8,9 +8,9 @@ ignore_basepython_conflict = True
basepython = python3 basepython = python3
usedevelop = True usedevelop = True
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY deps =
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -U {opts} {packages} -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
deps = -r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
commands = python setup.py testr --slowest --testr-args='{posargs}' commands = python setup.py testr --slowest --testr-args='{posargs}'
whitelist_externals = find whitelist_externals = find
@ -20,10 +20,11 @@ commands = {posargs}
[testenv:docs] [testenv:docs]
commands = commands =
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
python setup.py build_sphinx sphinx-build -W -b html doc/source doc/build/html
[testenv:doc8] [testenv:doc8]
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
doc8 doc8
commands = doc8 doc/source commands = doc8 doc/source