summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-05-03 16:42:58 +0000
committerGerrit Code Review <review@openstack.org>2023-05-03 16:42:58 +0000
commit36649bd7147a682f510b5bb8ec1c8fff1fa43d4c (patch)
treeda042bbb4031699693c8236611be1732a76169be
parent109f91a3649154ce044cf8fba2d7c422ef77a3fd (diff)
parent5783cb6026681b2ab74dddd3a5178e5eecbc8a34 (diff)
downloadcinder-stable/wallaby.tar.gz
Merge "[stable-only] Pin tox <4" into stable/wallabystable/wallaby
-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 8bba0aae4..f3569e336 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,6 @@
- project:
+ vars:
+ ensure_tox_version: '<4'
templates:
- openstack-python3-wallaby-jobs
- openstack-python3-wallaby-jobs-arm64
diff --git a/tox.ini b/tox.ini
index e801de483..6636861a3 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