From c66b9911b8dcf89910fcab45e9a8211e30419ccf Mon Sep 17 00:00:00 2001
From: Brian Rosmaita <rosmaita.fossdev@gmail.com>
Date: Wed, 18 Jan 2023 11:25:08 -0500
Subject: [PATCH] Continue using tox 3

Use the classic cinderclient tox.ini that has worked so well in the
past with tox 3; only change is to add the tox<4 requires statement.
Also adjust .zuul.yaml to express our preference for tox<4 in the
case that zuul has to install tox.

Change-Id: Ib1f55f9431033ad043507c6f751ee9bfe57d5cbb
---
 .zuul.yaml | 2 ++
 tox.ini    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.zuul.yaml b/.zuul.yaml
index e29487bf1..64d85ead0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -38,6 +38,8 @@
       tox_envlist: functional-py39
 
 - project:
+    vars:
+      ensure_tox_version: '<4'
     templates:
       - check-requirements
       - lib-forward-testing-python3
diff --git a/tox.ini b/tox.ini
index cda4d2673..1cd674d12 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
 distribute = False
 envlist = py3,pep8
 minversion = 3.18.0
+requires = tox<4
 skipsdist = True
 # this allows tox to infer the base python from the environment name
 # and override any basepython configured in this file