From 5e5b6751d32aa50dc372c55b5c2044d0dade51f4 Mon Sep 17 00:00:00 2001 From: Balazs Gibizer Date: Mon, 9 Jan 2023 10:54:40 +0100 Subject: [PATCH] Remove basepython def from tox.ini It seems that with tox 4.2.6 the missing interpreter error was fixed but the generative testenv feature is broken and the [testenv:functional{,-py38,-py39,-py310}] format is leads to missing interpreter error. It is due to a conflict between basepython = python3 and the version fragment in the generative target suppressed by ignore_basepython_conflict = true. This patch removes basepython = python3 assuming that developers already switched for python3 in their environment as python2.7 is EOL. Also we took the opportunity to add the global constraints via the install_command instead of deps as deps is not used during the installation of the editable package. Change-Id: I258a7c13434b29402804181dea275b42d5539df0 --- tox.ini | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tox.ini b/tox.ini index 1ae5e32364b6..8272774fa912 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,8 @@ [tox] minversion = 3.18.0 envlist = py3,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 [testenv] -basepython = python3 usedevelop = True allowlist_externals = bash @@ -15,6 +10,7 @@ allowlist_externals = rm env make +install_command = python -I -m pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} setenv = VIRTUAL_ENV={envdir} LANGUAGE=en_US @@ -26,8 +22,6 @@ setenv = # TODO(stephenfin): Remove once we bump our upper-constraint to SQLAlchemy 2.0 SQLALCHEMY_WARN_20=1 deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} - -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt extras = zvm

AltStyle によって変換されたページ (->オリジナル) /