summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-02-13 21:34:36 +0000
committerGerrit Code Review <review@openstack.org>2023-02-13 21:34:36 +0000
commit042afb2e9aa16011b5e60c00d0fbf25caf76db8d (patch)
treedcda9485f66783d2c9174a5e81217f82c2d7af06
parent826b40281123d700b3aeba5dcf076544982973a3 (diff)
parent426f6337b62a0b7e3307d89facb03f785c360e40 (diff)
downloadcinder-042afb2e9aa16011b5e60c00d0fbf25caf76db8d.tar.gz
Merge "[stable-only] Pin tox <4" into stable/zed
-rw-r--r--.zuul.yaml2
-rw-r--r--tox.ini4
2 files changed, 5 insertions, 1 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index d94ee7597..9f181bc79 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,6 @@
- project:
+ vars:
+ ensure_tox_version: '<4'
templates:
- openstack-python3-zed-jobs
- openstack-python3-zed-jobs-arm64
diff --git a/tox.ini b/tox.ini
index 95d07102d..dd55f21eb 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