From fffb31331f13aeb25441b9649687ebdd09fa711d Mon Sep 17 00:00:00 2001 From: Aric Gardner Date: Mon, 28 Oct 2019 14:03:20 -0400 Subject: [PATCH] pip update virtualenv in tox-install tox calls system virtualenv which breaks the coala linter. as well as bringing with it a a very old version of pip from system. updating virtualenv fixes this. Also, envlist no longer has py35,py36,py37 so remove pins that were for supporting old python version removed python2 workarounds. -python3 -m nltk.downloader ect Also removed -passenv = TOX_WORK_DIR -toxworkdir = {env:TOX_WORK_DIR:/tmp/v} This was added in 11728 "By default tox environment will now be installed under /tmp/v/{envname} but configurable through the CLI environment by specifying TOX_WORK_DIR." builder-jjb-merge and builder-jjb-verify to not call tox. So it would not help with opnfv race conditions with multiple jjb verify/deploys running on a static builder. there are actually no tox jobs for opnfv/releng repo. Pretty sure this does nothing and just adds a layer of complexity that is not needed. so removed. ISSUE: RELENG-2366 Signed-off-by: Aric Gardner Change-Id: I07875a62341e28860a81ee7b2149393c148be84b --- shell/tox-install.sh | 4 ++-- tox.ini | 14 ++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/shell/tox-install.sh b/shell/tox-install.sh index 83097f98..f8472cc9 100644 --- a/shell/tox-install.sh +++ b/shell/tox-install.sh @@ -18,9 +18,9 @@ set -eux -o pipefail if [[ $PYTHON == "python2" ]]; then - $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv more-itertools~=5.0.0 + $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0 else - $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv + $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv fi diff --git a/tox.ini b/tox.ini index 29ba2361..a272a83d 100644 --- a/tox.ini +++ b/tox.ini @@ -9,26 +9,20 @@ envlist = jjb-version, license, pre-commit -skipsdist = true -passenv = TOX_WORK_DIR -toxworkdir = {env:TOX_WORK_DIR:/tmp/v} +skipsdist = True [testenv:coala] basepython = python3 deps = coala coala-bears - pygments~=2.3.1 - # request-2.22.0 does not work with python-3.4.9 - requests~=2.21.0 - # Markdown lint requires nodejs + pygments + requests nodeenv - # numpy-1.17.0 requires python 3.5 - numpy~=1.16.4 + numpy commands = nodeenv -p npm install --global remark-cli remark-lint write-good - python3 -m nltk.downloader punkt maxent_treebank_pos_tagger averaged_perceptron_tagger coala --non-interactive [testenv:docs] -- 2.16.6