From fbf65834bd6904c6b51ddd3474042cdac9c2ee4d Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 10 Dec 2020 19:11:46 +0100 Subject: Use pip==20.2.4 in tox venv MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pip 20.3 is disruptive and would lead to big changes in stable branches. Change-Id: Ic3770f4098c52b0d26bc62291c9e79e8ee81d107 Signed-off-by: Cédric Ollivier (cherry picked from commit 0c99749bb65cadd0142c90cd73e13802d48cb7f6) --- .circleci/config.yml | 2 +- .travis.yml | 2 +- tox.ini | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7d4c4b4a..b8e0fe99 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: command: sudo apt-get update && sudo apt-get install python2.7-dev - run: name: Run tox - command: sudo pip install tox && tox + command: sudo pip install tox tox-pip-version && tox - store_artifacts: path: cover destination: cover diff --git a/.travis.yml b/.travis.yml index a494f2c0..46359da9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_script: - sudo add-apt-repository -y ppa:deadsnakes/ppa - sudo apt-get update - sudo apt-get install python3.6 python3.6-dev - - sudo pip install tox + - sudo pip install tox tox-pip-version - docker login -u="${DOCKER_USERNAME}" -p="${DOCKER_PASSWORD}" - (cd .. && git clone https://github.com/estesp/manifest-tool) - (cd ../manifest-tool && git checkout v0.9.0) diff --git a/tox.ini b/tox.ini index 602ee316..f844e3d6 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,7 @@ envlist = pep8,pylint,yamllint,ansiblelint,bashate,py27,py36,bandit,perm [testenv] +pip_version = pip==20.2.4 usedevelop = True deps = -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=stable/iruya -- cgit 1.2.3-korg