Fix tox.ini

Change-Id: If7f67326a9fc72fc477f6c83957de3181d086a7b
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 50b25ab8eff556922c04375b1681d2a07a3065d1)

diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst
index 760ae49..1c80648 100644 (file)
--- 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 1c79167..e339d2f 100644 (file)
--- 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 d3202f2..3f93a3e 100644 (file)
--- 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