Cleanup py27 support and docs

This repo is now testing only with Python 3, so let's make
a few cleanups:
- Remove python 2.7 stanza from setup.py
- Remove obsolete sections from setup.cfg
- Update requirements, no need for python_version anymore
- Cleanup */source/conf.py to remove now obsolete content.
- Use newer openstackdocstheme version
- Remove install_command from tox.ini, the default is fine
- Enable warnings for doc builds, fix doc build problems

Change-Id: Id1ecc85694dddd177dde628a031b7cb637932fbc
This commit is contained in:
Andreas Jaeger 2020-04-11 15:28:55 +02:00
parent a340815d72
commit 1d3fa5934d
7 changed files with 9 additions and 33 deletions

View File

@ -2,8 +2,8 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
openstackdocstheme>=1.18.1 # Apache-2.0
sphinx>=1.8.0,!=2.1.0 # BSD
openstackdocstheme>=1.31.2 # Apache-2.0
# releasenotes
reno>=2.5.0 # Apache-2.0
doc8>=0.6.0 # Apache-2.0

View File

@ -42,9 +42,6 @@ copyright = u'2018, OpenStack Developers'
# openstackdocstheme options
repository_name = 'openstack/openstack-helm-images'
bug_project = '64'
bug_tag = ''
html_last_updated_fmt = '%Y-%m-%d %H:%M'
use_storyboard = True
# If true, '()' will be appended to :func: etc. cross-reference text.

View File

@ -63,11 +63,14 @@ an overview of the build process for each container.
:maxdepth: 2
:caption: Contents:
calicoctl-utility
ceph-config-helper
ceph-daemon
gate-utils
libvirt
mariadb
openvswitch
ospurge
tempest
vbmc
loci

View File

@ -57,9 +57,6 @@ copyright = u'2018, OpenStack Developers'
# openstackdocstheme options
repository_name = 'openstack/openstack-helm-images'
bug_project = '64'
bug_tag = ''
html_last_updated_fmt = '%Y-%m-%d %H:%M'
use_storyboard = True
# The version info for the project you're documenting, acts as replacement for

View File

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

View File

@ -13,17 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools
# In python < 2.7.4, a lazy loading of package `pbr` will break
# setuptools if some other modules registered functions in `atexit`.
# solution from: http://bugs.python.org/issue15881#msg170215
try:
import multiprocessing # noqa
except ImportError:
pass
setuptools.setup(
setup_requires=['pbr'],
pbr=True)

View File

@ -6,8 +6,6 @@ ignore_basepython_conflict = True
[testenv]
basepython = python3
install_command =
pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages}
setenv =
PYTHONUNBUFFERED=1
VIRTUAL_ENV={envdir}
@ -23,11 +21,13 @@ whitelist_externals =
commands = {posargs}
[testenv:docs]
deps = -r{toxinidir}/doc/requirements.txt
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt
commands =
bash -c "rm -rf doc/build"
doc8 doc
sphinx-build --keep-going -b html doc/source doc/build/html
sphinx-build -W --keep-going -b html doc/source doc/build/html
[doc8]
extensions = .rst