Cleanup py27 support and docs

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 version
- Remove install_command from tox.ini, the default is fine

Change-Id: I785318b3090d7117d74d165ba3236dc239cf9ea1
This commit is contained in:
Andreas Jaeger 2020-04-11 15:33:05 +02:00
parent b1f3cb8ac8
commit 34a7533b64
4 changed files with 5 additions and 18 deletions

View File

@ -2,7 +2,6 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
sphinxcontrib-blockdiag>=1.1.0
openstackdocstheme>=1.28.0 # Apache-2.0
openstackdocstheme>=1.31.2 # Apache-2.0

View File

@ -26,8 +26,6 @@ extensions = [
# openstackdocstheme options
repository_name = 'openstack/openstack-helm'
bug_project = '886'
bug_tag = 'docs'
use_storyboard = True
# autodoc generation is a bit aggressive and a nuisance when doing heavy

View File

@ -10,12 +10,3 @@ classifier =
Intended Audience :: Developers
License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux
[build_sphinx]
all_files = 1
build-dir = doc/build
source-dir = doc/source
warning-is-error = True
[wheel]
universal = 1

View File

@ -6,9 +6,8 @@ ignore_basepython_conflict = True
[testenv]
basepython = python3
install_command = pip install -U {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
passenv = *_proxy *_PROXY
[testenv:venv]
@ -17,7 +16,7 @@ commands = {posargs}
[testenv:docs]
deps = -r{toxinidir}/doc/requirements.txt
commands =
bash -c "rm -rf doc/build"
rm -rf doc/build
docstheme-build-translated.sh
whitelist_externals =
bash
rm