From b64f07b80d6ab992fd1a517cedb5522044752151 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 27 Apr 2020 19:54:28 +0200 Subject: [PATCH] Cleanup py27 support This repo is now testing only with Python 3, so let's make a few cleanups: - Remove setup.* files, those are not needed for this repo. - Cleanup */source/conf.py to remove now obsolete content. - Remove install_command from tox.ini, the default is fine, move constraints into deps - Enable warnings for docs build Change-Id: I07da37d6f15aefc7b2fa558a6ead7028d6c9c556 --- doc/source/conf.py | 22 ---------------------- releasenotes/source/conf.py | 9 --------- setup.cfg | 24 ------------------------ setup.py | 29 ----------------------------- tox.ini | 12 ++++++------ 5 files changed, 6 insertions(+), 90 deletions(-) delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/doc/source/conf.py b/doc/source/conf.py index f93f3605..61905fb2 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -22,8 +22,6 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import pbr.version - # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. @@ -67,22 +65,6 @@ role_name = 'rabbitmq_server' target_name = 'openstack-ansible-' + role_name title = 'OpenStack-Ansible Documentation: ' + role_name + ' role' -# The link to the browsable source code (for the left hand menu) -oslosphinx_cgit_link = ( - 'https://opendev.org/openstack/{}'.format(target_name) -) - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version_info = pbr.version.VersionInfo(target_name) -# The full version, including alpha/beta/rc tags. -release = version_info.version_string_with_vcs() -# The short X.Y version. -version = version_info.canonical_version_string() - # openstackdocstheme options repository_name = 'openstack/' + target_name bug_project = project.lower() @@ -173,10 +155,6 @@ html_static_path = ['_static'] # directly to the root of the documentation. # html_extra_path = [] -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. # html_use_smartypants = True diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 4ee52780..987122fb 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -62,11 +62,6 @@ role_name = 'rabbitmq_server' target_name = 'openstack-ansible-' + role_name title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role' -# The link to the browsable source code (for the left hand menu) -oslosphinx_cgit_link = ( - 'https://opendev.org/openstack/{}'.format(target_name) -) - # Release notes do not need a version number in the title, they # cover multiple releases. # The full version, including alpha/beta/rc tags. @@ -158,10 +153,6 @@ html_static_path = ['_static'] # directly to the root of the documentation. # html_extra_path = [] -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. # html_use_smartypants = True diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 36da6af8..00000000 --- a/setup.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[metadata] -name = openstack-ansible-rabbitmq_server -summary = rabbitmq_server for OpenStack Ansible -description-file = - README.rst -author = OpenStack -author-email = openstack-discuss@lists.openstack.org -home-page = https://docs.openstack.org/openstack-ansible-rabbitmq_server/latest/ -classifier = - Intended Audience :: Developers - Intended Audience :: System Administrators - License :: OSI Approved :: Apache Software License - Operating System :: POSIX :: Linux - -[build_sphinx] -all_files = 1 -build-dir = doc/build -source-dir = doc/source - -[pbr] -warnerrors = True - -[wheel] -universal = 1 diff --git a/setup.py b/setup.py deleted file mode 100644 index 566d8443..00000000 --- a/setup.py +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# 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>=2.0.0'], - pbr=True) diff --git a/tox.ini b/tox.ini index 8411485a..bf5762f0 100644 --- a/tox.ini +++ b/tox.ini @@ -6,9 +6,7 @@ ignore_basepython_conflict = True [testenv] basepython = python3 -usedevelop = True -install_command = - pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} +usedevelop = False commands = /usr/bin/find . -type f -name "*.pyc" -delete passenv = @@ -33,11 +31,13 @@ setenv = WORKING_DIR={toxinidir} [testenv:docs] -deps = -r{toxinidir}/doc/requirements.txt +deps = + -c{env:TOX_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 [testenv:pdf-docs] deps = {[testenv:docs]deps} @@ -52,7 +52,7 @@ commands = extensions = .rst [testenv:releasenotes] -deps = -r{toxinidir}/doc/requirements.txt +deps = {[testenv:docs]deps} commands = sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html