From 8ecfd4c886507fe602398a8623e6044d40ea8090 Mon Sep 17 00:00:00 2001 From: Gwenael Lambrouin Date: Fri, 6 Jan 2023 17:53:23 +0100 Subject: Cleanup requirements & tox config, update pylint - remove useless Python packages - make the purpose of each requirements.txt file explicit - don't overlap between requirements.txt files - fix requirements so that the "new" pip dependency resolver (enabled by default since pip 20.3) work. Consequently, it is not necessary to pin pip version to 20.2.4 and we can drop tox-pip-version - remove unused tox environments - skip the installation of nfvbench in the tox environments where this is not necessary - update pylint 2.10.2 => 2.15.9 (that was necessary to fix some requirement conflicts): - disable some of new checkers: consider-using-f-string,consider-using-generator,unnecessary-lambda-assignment,implicit-str-concat,global-variable-not-assigned - remove many obsolete checkers from the disable list - apply a simple refactor suggestion in nfvbench code - upgrade to Python 3.8 some remaining references to Python 3.6 Change-Id: I55c0fb144b9199681962f396582590aba89ed02c Signed-off-by: Gwenael Lambrouin --- tox.ini | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index a5bd504..9b4d218 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,6 @@ envlist = py38,pep8,lint,docs,docs-linkcheck skipsdist = True [testenv] -pip_version = pip==20.2.4 usedevelop = True install_command = pip install -U {opts} {packages} setenv = @@ -17,20 +16,14 @@ commands = py.test -q --basetemp={envtmpdir} {posargs} test/ [testenv:pep8] basepython = python3.8 +skip_install = True commands = flake8 {toxinidir} [testenv:lint] basepython = python3.8 +skip_install = True commands = pylint --rcfile pylint.rc nfvbench test -[testenv:venv] -basepython = python3.8 -commands = {posargs} - -[testenv:cover] -basepython = python3.8 -commands = python setup.py testr --coverage --testr-args='{posargs}' - [flake8] # H803 skipped on purpose per list discussion. # E123, E125 skipped as they are invalid PEP-8. @@ -75,6 +68,7 @@ basepython = python3.8 deps = -chttps://opendev.org/openstack/requirements/raw/branch/stable/yoga/upper-constraints.txt -rdocs/requirements.txt +skip_install = True commands = sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html echo "Generated docs available in {toxinidir}/docs/_build/html" @@ -85,5 +79,6 @@ basepython = python3.8 deps = -chttps://opendev.org/openstack/requirements/raw/branch/stable/yoga/upper-constraints.txt -rdocs/requirements.txt +skip_install = True passenv = http_proxy https_proxy no_proxy commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck -- cgit 1.2.3-korg