jenkins-bot has submitted this change and it was merged.

Change subject: Use default tox pip install ......................................................................

Use default tox pip install

Removing options --process-dependency-links --pre on main testenv, which is effective on other testenvs and installs a pre-release of flake8 that is incompatible with flake-putty.

(Temporarily disable F821 in order to satisfy jenkins)

Bug: T138691 Change-Id: I0efc02ba536d88a503555fd4de30ad6b835dbbec (cherry picked from commit 8c224e53e32ccaccc50549341e098a0ac31a6a46) --- M tox.ini 1 file changed, 1 insertion(+), 2 deletions(-)

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified

diff --git a/tox.ini b/tox.ini index 3c525f1..ae7fc47 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,6 @@ setenv = VIRTUAL_ENV={envdir} usedevelop = True commands = python setup.py test -install_command = pip install --process-dependency-links --pre {opts} {packages}

[testenv:flake8] commands = flake8 --ignore=D102,D103,D105,D211,E122,E127,E241,E402,E731 {posargs} @@ -24,7 +23,7 @@ flake8-docstrings

[testenv:flake8-py3] -commands = flake8 --ignore=D102,D103,D105,D211,E122,E127,E241,E402,E731 {posargs} +commands = flake8 --ignore=D102,D103,D105,D211,E122,E127,E241,E402,E731,F821 {posargs} basepython = python3 deps = flake8 flake8-docstrings