From 8d5c5bd6ce2b63b8caf4f447292aa404f40a43e2 Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Mon, 17 Jul 2023 19:17:08 +0000 Subject: [PATCH] Fix zuul failures for setuptools and pbr A New version of setuptools was released July 14 2023 which does not work with the pbr version for this branch. The fix is based on https://review.opendev.org/c/openstack/ceilometer/+/888711 The 'requires' tag in tox was added in 3.2 setuptools is capped in tox.ini tox is also capped. Signed-off-by: Al Bailey Change-Id: I737885d2e6e2242e8fcb121e87611fd86d43a9db --- tox.ini | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 00bc2d2a3..5789667a7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,14 @@ [tox] envlist = linters,pylint -minversion = 2.3 +minversion = 3.2 skipsdist = True stxdir = {toxinidir}/.. +# Cap setuptools via virtualenv to prevent compatibility issue with pb5 5.5.0 +# Tox is also needed to be constrained +requires = + virtualenv<20.24.0 + tox<4 + [testenv] install_command = pip install -U \