summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-10-05 21:08:02 +0000
committerGerrit Code Review <review@openstack.org>2021-10-05 21:08:02 +0000
commitf331e90d10eb640393020edc48fa0ed9acd51b3a (patch)
tree655b53f7adf518e8394b748ed1a6c9ebe686a7b9
parent6f774f226bcf8c5468de92d3eea80962656754cd (diff)
parentb27f8e9adfcf2db3c83722c42e055ba5065ad06e (diff)
downloadnova-f331e90d10eb640393020edc48fa0ed9acd51b3a.tar.gz
Merge "[stable-only] Pin virtualenv and setuptools" into stable/ussuri
-rw-r--r--tox.ini6
1 files changed, 5 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index e5d0e45446..9e1bec5fd8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,14 @@
[tox]
-minversion = 3.1.1
+minversion = 3.2.0
envlist = py37,functional,pep8
# Automatic envs (pyXX) will only use the python version appropriate to that
# env and ignore basepython inherited from [testenv] if we set
# ignore_basepython_conflict.
ignore_basepython_conflict = True
+# Pin the virtualenv and therefore the setuptools version used for the env
+# creation. This results in a new tox being installed in .tox/.tox virtualenv
+# and the tox on the host will delegate all the calls to the tox in that env.
+requires = virtualenv<20.8
[testenv]
basepython = python3