summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-04-26 22:37:23 +0000
committerGerrit Code Review <review@openstack.org>2023-04-26 22:37:23 +0000
commit6d272c4dc04ef052a285d9869f74ca3732571da5 (patch)
tree244f1b64ab5bd8e9f82573bc44f3a6238d2b4b1f
parent9f7527973997baa5e685ea57d1563232234bc872 (diff)
parent0518c60235abc2405f532f80a9e1b998955957a9 (diff)
downloadswift-6d272c4dc04ef052a285d9869f74ca3732571da5.tar.gz
Merge "CI: Use [tox]requires to pin virtualenv"
-rw-r--r--.zuul.yaml2
-rw-r--r--tox.ini5
2 files changed, 6 insertions, 1 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index b0bf91be7..16e5fd2e2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -527,7 +527,7 @@
name: swift-tox-lower-constraints
parent: openstack-tox-lower-constraints
# This seems defensible for a l-c job
- nodeset: ubuntu-bionic
+ nodeset: ubuntu-jammy
vars:
bindep_profile: test py27
python_version: 2.7
diff --git a/tox.ini b/tox.ini
index 86f81ee28..8cc365749 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,11 @@
[tox]
envlist = py37,py27,pep8
minversion = 3.18.0
+requires =
+ # required to support py27/py36 envs
+ virtualenv<20.22
+ # project-wide requirement; see .zuul.yaml
+ tox<4
[pytest]
addopts = --verbose