diff options
| author | Balazs Gibizer <balazs.gibizer@est.tech> | 2021-09-22 17:54:23 +0200 |
|---|---|---|
| committer | melanie witt <melwittt@gmail.com> | 2021-10-05 21:39:56 +0000 |
| commit | f1be212a86262f128e73f7201b7b3e51334f1ab4 (patch) | |
| tree | b41264cdfdae0c97c1295bef780ab49df5d0889b | |
| parent | 48ad6b498d9934867bfa9ec7fe83907029b512c5 (diff) | |
| download | nova-f1be212a86262f128e73f7201b7b3e51334f1ab4.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
Conflicts:
tox.ini
NOTE(melwitt): The conflict is because change
Ie1a0cbd82a617dbcc15729647218ac3e9cd0e5a9 (Stop testing Python 2) is
not in Train.
Change-Id: I26b2a14e0b91c0ab77299c3e4fbed5f7916fe8cf
(cherry picked from commit b27f8e9adfcf2db3c83722c42e055ba5065ad06e)
| -rw-r--r-- | tox.ini | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,10 +1,14 @@ [tox] -minversion = 3.1.1 +minversion = 3.2.0 envlist = py27,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 |