From 1660b699c9b4ed13acb4f027bfbc751a0bdcb7a6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Wed, 31 Aug 2022 22:01:39 +0200 Subject: [PATCH] [TOX] Force py3.8 in tox.ini and fix lint problems MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - It allows leveraging on OpenStack Yoga's upper-contraints without any exception. - Use only gitlint-core as a dependency Issue-ID: DOC-782 Signed-off-by: Michal Jagiello Signed-off-by: Cédric Ollivier Change-Id: I05d6b683fda61cabed4e5e812ddc3d37ae5e28b6 (cherry picked from commit 92cdf226933eab1f422e30f2ead2ee153016cd84) --- requirements.txt | 2 +- tox.ini | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index 554df8559d..4913184e9c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,4 @@ sphinxcontrib-spelling PyEnchant pylint autopep8 -gitlint +gitlint-core diff --git a/tox.ini b/tox.ini index 6388e88cea..d90f545f92 100644 --- a/tox.ini +++ b/tox.ini @@ -12,34 +12,37 @@ skipsdist=true ignore-path-errors=docs/helm-search.txt;D001 [testenv:doc8] +basepython = python3.8 deps = -r{toxinidir}/requirements.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt + -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt commands = - doc8 docs/ [testenv:docs] +basepython = python3.8 deps = -r{toxinidir}/requirements.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt + -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt commands = sphinx-build -q -W -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html [testenv:docs-linkcheck] +basepython = python3.8 deps = -r{toxinidir}/requirements.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt + -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt commands = sphinx-build -q -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck [testenv:spelling] -#basepython = python3 +basepython = python3.8 whitelist_externals = wget deps = -r{toxinidir}/requirements.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt + -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt changedir={toxinidir}/docs commands = @@ -47,10 +50,10 @@ commands = sphinx-build -b spelling -d {envtmpdir}/doctrees . _build/spelling [testenv:gitlint] -basepython = python3 +basepython = python3.8 deps = -r{toxinidir}/requirements.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt + -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt commands = gitlint @@ -70,17 +73,19 @@ commands = find . -not -path '*/\.*' -name *.sh -exec shellcheck \{\} + [testenv:autopep8] +basepython = python3.8 deps = -r{toxinidir}/requirements.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt + -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt commands = autopep8 --max-line-length 120 --in-place --recursive kubernetes/ TOSCA/ docs/ [testenv:pylint] +basepython = python3.8 deps = -r{toxinidir}/requirements.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt + -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt whitelist_externals = find commands = -- 2.16.6