From a7dfaf4243ae4a75971462ad35765acfedca6a89 Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Thu, 22 Dec 2022 18:11:07 -0500 Subject: [PATCH] [stable-only] Pin tox <4 Continue to use tox 3 in the stable branches. Two changes: - .zuul.yaml: set the ensure_tox_version to use <4, which will tell zuul to install tox<4 if it's not present - tox.ini: set requires=tox<4 so that if tox has been installed already, our tox-based jobs will use tox 3 to run the tests Change-Id: Ida6359ddebc59091f2f2dfc951950538793d0109 --- .zuul.yaml | 2 ++ tox.ini | 1 + 2 files changed, 3 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index c6e340e8e..565e3923d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,6 @@ - project: + vars: + ensure_tox_version: '<4' templates: - check-requirements - lib-forward-testing-python3 diff --git a/tox.ini b/tox.ini index dc94d8bf9..a3ae02351 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] minversion = 3.18.0 +requires = tox<4 skipsdist = True # python runtimes: https://governance.openstack.org/tc/reference/runtimes/ussuri.html envlist = py3,pep8