From 03052d458ab6017ef732e9b7ae2455c669650326 Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Thu, 22 Dec 2022 14:38:48 -0500 Subject: [PATCH] [stable-only] Pin tox <4 Continue to use tox 3 until we decide how to do the transition to tox 4 in the stable branches. Two changes: - .zuul.yaml: set the ensure_tox_version to use <4, which will tell the host to install a tox 3 package ... but: - tox.ini: from experimentation, it looks like if tox needs to install anything from the 'requires' key in the core section, it will also upgrade itself (in the .tox/.tox directory) to the latest tox version, so add a cap on tox to the 'requires' list Change-Id: I3c22ff2d6e2951c6a8ba110d4393a399480e0f3f (cherry picked from commit 426f6337b62a0b7e3307d89facb03f785c360e40) (cherry picked from commit 416eba72e4ba7a811bc0a940705eb661e40d2681) --- .zuul.yaml | 2 ++ tox.ini | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 435020c5da7..4730dd66e9b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,6 @@ - project: + vars: + ensure_tox_version: '<4' templates: - openstack-python3-xena-jobs - openstack-python3-xena-jobs-arm64 diff --git a/tox.ini b/tox.ini index 383ea3d2836..7ad4f0eb591 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,8 @@ [tox] minversion = 3.18.0 -requires = virtualenv>=20.4.2 +requires = + virtualenv>=20.4.2 + tox<4 skipsdist = True # python runtimes: https://governance.openstack.org/tc/reference/project-testing-interface.html#tested-runtimes envlist = py3,compliance,pep8