From a7649dff466fbddc091817b2801d73a68b84d3e8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Thu, 3 Jul 2025 12:52:56 +0200 Subject: [PATCH] Fix tox.ini MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: If7f67326a9fc72fc477f6c83957de3181d086a7b Signed-off-by: Cédric Ollivier (cherry picked from commit 50b25ab8eff556922c04375b1681d2a07a3065d1) --- docs/release/release-notes/functest-release.rst | 9 -------- tox.ini | 28 ++++++++++++------------- upper-constraints.txt | 1 + 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst index 760ae4921..1c806488d 100644 --- a/docs/release/release-notes/functest-release.rst +++ b/docs/release/release-notes/functest-release.rst @@ -147,12 +147,3 @@ Code quality * pylint: 10.00/10 * code coverage: 70% - -Useful links -============ - - * Functest git repository: https://github.com/opnfv/functest - * Functest CI dashboard: https://build.opnfv.org/ci/view/functest/ - * JIRA dashboard: https://jira.opnfv.org/secure/Dashboard.jspa?selectPageId=10611 - * Functest IRC channel: #opnfv-functest - * Reporting page: http://testresults.opnfv.org/reporting/master/functest/functest.html diff --git a/tox.ini b/tox.ini index 1c7916764..e339d2fce 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/unmaintained/yoga/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -install_command = pip install {opts} {packages} +install_command = pip install --use-deprecated=legacy-resolver {opts} {packages} commands = pytest \ --junit-xml=junit.xml \ @@ -45,13 +45,13 @@ commands = [testenv:yamllint] basepython = python3.10 files = - .travis.yml - docker - functest/ci - functest/opnfv_tests/openstack/rally/blacklist.yaml - functest/opnfv_tests/openstack/rally/rally_jobs.yaml - functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml - functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml + .travis.yml \ + docker \ + functest/ci \ + functest/opnfv_tests/openstack/rally/blacklist.yaml \ + functest/opnfv_tests/openstack/rally/rally_jobs.yaml \ + functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml \ + functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml \ functest/opnfv_tests/vnf commands = yamllint -s {[testenv:yamllint]files} @@ -59,11 +59,11 @@ commands = [testenv:bashate] basepython = python3.10 files = - functest/opnfv_tests/openstack/cinder/write_data.sh - functest/opnfv_tests/openstack/cinder/read_data.sh - functest/ci/add_proxy.sh - functest/ci/convert_images.sh - functest/ci/download_images.sh + functest/opnfv_tests/openstack/cinder/write_data.sh \ + functest/opnfv_tests/openstack/cinder/read_data.sh \ + functest/ci/add_proxy.sh \ + functest/ci/convert_images.sh \ + functest/ci/download_images.sh \ build.sh commands = bashate -e E005,E006,E042,E043 {[testenv:bashate]files} @@ -74,7 +74,7 @@ commands = bandit -r functest -x tests -n 5 -ll -s B601,B602 [testenv:cover] basepython = python3.10 dirs = - functest/tests/unit/openstack/vping + functest/tests/unit/openstack/vping \ functest/tests/unit/openstack/cinder commands = pytest --cov=xtesting --cov-reset --cov-report html --cov-fail-under=100 \ diff --git a/upper-constraints.txt b/upper-constraints.txt index d3202f25d..3f93a3ee8 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -23,3 +23,4 @@ ansible-lint===5.2.1 setuptools_scm===6.3.2 pre-commit===3.1.1 os-faults==0.2.7 +sphinx-rtd-theme===1.0.0 -- 2.16.6