summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Rosmaita <rosmaita.fossdev@gmail.com>2023-01-18 11:25:08 -0500
committerBrian Rosmaita <rosmaita.fossdev@gmail.com>2023-01-18 11:25:08 -0500
commitc66b9911b8dcf89910fcab45e9a8211e30419ccf (patch)
treee0416ca5ac9a6f10f78332088a3e1ce954782e1c
parent20506ef3a8b5fb1b7a9b0a2c31dbe5f60eea2130 (diff)
downloadpython-cinderclient-c66b9911b8dcf89910fcab45e9a8211e30419ccf.tar.gz
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
-rw-r--r--.zuul.yaml2
-rw-r--r--tox.ini1
2 files changed, 3 insertions, 0 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index e29487b..64d85ea 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 cda4d26..1cd674d 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