From 59786da1bb1769ee7176a5f53a2e777f9f1d0747 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 30 May 2022 16:01:10 +0200 Subject: [PATCH] Switch sphinx language to en With sphinx release of 5.0.0, they changed default for language variable to 'en' from None. With that current None valuable is not valid and should not be used. With that we're also dropping setup.py as otherwise new setuptools fails for docs job as well. Change-Id: I264ec313bb9cdb1363339688cc63f080156c12cc --- doc/source/conf.py | 2 +- setup.cfg | 10 ---------- setup.py | 20 -------------------- tox.ini | 2 +- 4 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/doc/source/conf.py b/doc/source/conf.py index 245f634..9ffad06 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -74,7 +74,7 @@ openstackdocs_bug_tag = '' # # This is also used if you do content translation via gettext catalogs. # Usually you set "language" from the command line for these cases. -language = None +language = 'en' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index ee34254..0000000 --- a/setup.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[metadata] -name = ansible-role-qdrouterd -summary = qdrouterd for Ansible -description-file = - README.rst -classifier = - Intended Audience :: Developers - Intended Audience :: System Administrators - License :: OSI Approved :: Apache Software License - Operating System :: POSIX :: Linux diff --git a/setup.py b/setup.py deleted file mode 100644 index c03df58..0000000 --- a/setup.py +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2018 Red Hat, Inc. -# -# 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. - -import setuptools - -setuptools.setup( - setup_requires=['pbr>=2.0.0'], - pbr=True) diff --git a/tox.ini b/tox.ini index 8af44db..11683f8 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ envlist = docs,linters,functional [testenv] -usedevelop = True +usedevelop = False commands = /usr/bin/find . -type f -name "*.pyc" -delete passenv =