Some cleanups
Some small changes for Victoria: * Remove obsolete sections from setup.cfg * Add Python 3.8 to setup.cfg * Update hacking to version 3.1.0, disable E741 as we can ignore this. * Switch to victoria jobs * Remove oslosphinx specific conditions from conf.py, oslosphinx is retired and will not work with current Sphinx/python/reno anyhow. Change-Id: I3a16eb66af59c8bd27b36c203260cfd3197f52f0
This commit is contained in:
parent
be6143655d
commit
1d503fa8ca
@ -1,6 +1,6 @@
|
||||
- project:
|
||||
templates:
|
||||
- openstack-python3-ussuri-jobs
|
||||
- openstack-python3-victoria-jobs
|
||||
- openstack-cover-jobs
|
||||
- publish-openstack-docs-pti
|
||||
- openstack-lower-constraints-jobs
|
||||
|
@ -12,29 +12,18 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# oslosphinx uses reno and reno uses oslosphinx. Make oslosphinx for
|
||||
# reno optional to break the build cycle
|
||||
try:
|
||||
import openstackdocstheme # noqa
|
||||
except ImportError:
|
||||
has_theme = False
|
||||
else:
|
||||
has_theme = True
|
||||
|
||||
|
||||
# -- General configuration ----------------------------------------------------
|
||||
|
||||
# Add any Sphinx extension module names here, as strings. They can be
|
||||
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
|
||||
extensions = [
|
||||
'openstackdocstheme',
|
||||
'sphinx.ext.autodoc',
|
||||
'reno.sphinxext',
|
||||
'reno._exts.show_reno_config',
|
||||
]
|
||||
|
||||
if has_theme:
|
||||
extensions.append('openstackdocstheme')
|
||||
|
||||
# The master toctree document.
|
||||
master_doc = 'index'
|
||||
|
||||
@ -51,8 +40,7 @@ suppress_warnings = ['image.nonlocal_uri']
|
||||
|
||||
# -- openstackdocstheme configuration -----------------------------------------
|
||||
|
||||
if has_theme:
|
||||
html_theme = 'openstackdocs'
|
||||
html_theme = 'openstackdocs'
|
||||
|
||||
openstackdocs_repo_name = 'openstack/reno'
|
||||
openstackdocs_use_storyboard = True
|
||||
|
10
setup.cfg
10
setup.cfg
@ -17,6 +17,7 @@ classifier =
|
||||
Programming Language :: Python :: 3
|
||||
Programming Language :: Python :: 3.6
|
||||
Programming Language :: Python :: 3.7
|
||||
Programming Language :: Python :: 3.8
|
||||
Programming Language :: Python :: 3 :: Only
|
||||
Programming Language :: Python :: Implementation :: CPython
|
||||
|
||||
@ -34,12 +35,3 @@ distutils.commands =
|
||||
sphinx =
|
||||
sphinx>=2.0.0,!=2.1.0 # BSD
|
||||
docutils>=0.11 # OSI-Approved Open Source, Public Domain
|
||||
|
||||
[compile_catalog]
|
||||
directory = reno/locale
|
||||
domain = reno
|
||||
|
||||
[update_catalog]
|
||||
domain = reno
|
||||
output_dir = reno/locale
|
||||
input_file = reno/locale/reno.pot
|
||||
|
5
tox.ini
5
tox.ini
@ -16,7 +16,7 @@ commands =
|
||||
|
||||
[testenv:pep8]
|
||||
deps = {[testenv]deps}
|
||||
hacking >= 3.0.0,<3.1.0
|
||||
hacking >= 3.1.0,<3.2.0
|
||||
commands =
|
||||
flake8
|
||||
reno -q lint
|
||||
@ -53,8 +53,9 @@ commands = oslo_debug_helper {posargs}
|
||||
|
||||
[flake8]
|
||||
# E123, E125 skipped as they are invalid PEP-8.
|
||||
# E741 ambiguous variable name 'l'
|
||||
# W503 line break before binary operator
|
||||
show-source = True
|
||||
ignore = E123,E125,W503
|
||||
ignore = E123,E125,E741,W503
|
||||
builtins = _
|
||||
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
|
||||
|
Loading…
x
Reference in New Issue
Block a user