summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalazs Gibizer <balazs.gibizer@est.tech>2021-09-22 17:54:23 +0200
committerElod Illes <elod.illes@est.tech>2021-10-01 11:40:43 +0200
commitb27f8e9adfcf2db3c83722c42e055ba5065ad06e (patch)
tree713cdf2369b15b233481b9e7ff76d8951d08690a
parentcce1f9a0f04e4b3dfd88e001614b74a6d2a94956 (diff)
downloadnova-b27f8e9adfcf2db3c83722c42e055ba5065ad06e.tar.gz
[stable-only] Pin virtualenv and setuptools
Setuptools 58.0 (bundled in virtualenv 20.8) breaks the installation of decorator 3.4.0. So this patch pins virtualenv to avoid the break. As the used 'require' feature was introduced in tox in version 3.2 [1], the required minversion has to be bumped, too. [1] https://tox.readthedocs.io/en/latest/config.html#conf-requires Change-Id: I26b2a14e0b91c0ab77299c3e4fbed5f7916fe8cf
-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