openstack
/
nova
Code Issues Proposed changes

[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(elod.illes): The conflict is because change
I331c42a1a79b8a79d9afd04edb136c8c31dc483c is not in Stein.

Change-Id: I26b2a14e0b91c0ab77299c3e4fbed5f7916fe8cf
(cherry picked from commit b27f8e9adf)
(cherry picked from commit f1be212a86)
This commit is contained in:
Balazs Gibizer 2021-09-22 17:54:23 +02:00 committed by Elod Illes
parent cf092e8e40
commit 85cda94e67
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tox.ini
View File

@ -1,11 +1,15 @@
[tox]
minversion = 3.1.1
minversion = 3.2.0
envlist = py{27,35},functional,pep8
skipsdist = True
# Automatic envs (pyXX) will use the python version appropriate to that
# env and ignore basepython inherited from [testenv]. That's what we
# want, and we don't need to be warned about it.
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