Cleanup py27 support
This repo is now testing only with Python 3, so let's make a few cleanups: - Remove obsolete sections from setup.cfg - Update requirements, no need for python_version anymore - Cleanup doc/source/conf.py to remove now obsolete content. - Use newer openstackdocstheme and sphinx versions - Update constraints URL Change-Id: I71fad2f2287477ae570ae40a8705b035bbc6a38e
This commit is contained in:
parent
6919c93d66
commit
0b51f5917c
|
@ -29,7 +29,7 @@ extensions = [
|
|||
]
|
||||
|
||||
# Feed configuration for yasfb
|
||||
feed_base_url = 'http://specs.openstack.org/openstack/ironic-inspector'
|
||||
feed_base_url = 'https://specs.openstack.org/openstack/ironic-inspector'
|
||||
feed_author = 'OpenStack Ironic Inspector Team'
|
||||
|
||||
exclude_patterns = [
|
||||
|
@ -97,4 +97,3 @@ latex_documents = [
|
|||
# openstackdocstheme options
|
||||
repository_name = 'openstack/ironic-inspector-specs'
|
||||
use_storyboard = True
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
pbr!=2.1.0,>=2.0.0
|
||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
|
||||
openstackdocstheme>=1.20.0 # Apache-2.0
|
||||
sphinx!=2.1.0,>=2.0.0 # BSD
|
||||
openstackdocstheme>=2.0.0 # Apache-2.0
|
||||
yasfb>=0.5.1
|
||||
|
|
11
setup.cfg
11
setup.cfg
|
@ -11,14 +11,3 @@ classifier =
|
|||
Intended Audience :: Developers
|
||||
License :: OSI Approved :: Apache Software License
|
||||
Operating System :: POSIX :: Linux
|
||||
|
||||
[build_sphinx]
|
||||
source-dir = doc/source
|
||||
build-dir = doc/build
|
||||
all_files = 1
|
||||
|
||||
[pbr]
|
||||
warnerrors = True
|
||||
|
||||
[upload_sphinx]
|
||||
upload-dir = doc/build/html
|
||||
|
|
5
tox.ini
5
tox.ini
|
@ -1,5 +1,5 @@
|
|||
[tox]
|
||||
minversion = 1.6
|
||||
minversion = 3.1.1
|
||||
envlist = pep8,docs
|
||||
|
||||
[testenv]
|
||||
|
@ -7,7 +7,7 @@ basepython = python3
|
|||
usedevelop = True
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
|
||||
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||
|
||||
[testenv:venv]
|
||||
commands = {posargs}
|
||||
|
@ -26,6 +26,7 @@ commands = sphinx-build -W -b latex doc/source doc/build/pdf
|
|||
|
||||
[testenv:spelling]
|
||||
deps =
|
||||
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||
-r{toxinidir}/requirements.txt
|
||||
sphinxcontrib-spelling
|
||||
PyEnchant
|
||||
|
|
Loading…
Reference in New Issue