From b4be3a46032bd20c83847dd4ec32c49feddc5768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Beraud?= <hberaud@redhat.com>
Date: Fri, 17 Feb 2023 10:32:33 +0100
Subject: Fix issues related to tox4

Related to https://lists.openstack.org/pipermail/openstack-discuss/2023-February/032247.html

Change-Id: Ie97378271aeb3f98195fbe8433723ea556e9cf9e
---
 tox.ini | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tox.ini b/tox.ini
index 3069e46..5069c6c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,6 @@
 [tox]
 minversion = 3.2.0
 envlist = py3,pep8
-basepython = python3
-ignore_basepython_conflict = true
 
 [testenv]
 deps =
@@ -21,10 +19,16 @@ commands =
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py test --coverage --coverage-package-name=oslo_serialization --testr-args='{posargs}'
+setenv =
+    PYTHON=coverage run --source oslo_concurrency --parallel-mode
+  commands =
+    stestr run {posargs}
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
 
 [testenv:docs]
-whitelist_externals = rm
+allowlist_externals = rm
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/doc/requirements.txt
@@ -33,7 +37,7 @@ commands =
   sphinx-build -W --keep-going -b html doc/source doc/build/html
 
 [testenv:releasenotes]
-whitelist_externals = rm
+allowlist_externals = rm
 deps = {[testenv:docs]deps}
 commands =
   rm -rf releasenotes/build
-- 
cgit v1.2.1