From a707dbe72afa6398141d43135dc97ec32a40d412 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 10 Dec 2020 19:06:19 +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: Ifc4abd2d1f28bfb63ba66796e1690b398c1e4760 Signed-off-by: Cédric Ollivier (cherry picked from commit 9c9f1888d682cf1b794c956d7f6ab448cb42c6d7) --- .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 2bcd67f9..f050f93d 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: api/build destination: api diff --git a/.travis.yml b/.travis.yml index 3aca6bc1..8488dcc5 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 - sudo -E 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 bfe2b727..205f2f87 100644 --- a/tox.ini +++ b/tox.ini @@ -3,6 +3,7 @@ envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,py27,py36,cover,perm skipsdist = True [testenv] +pip_version = pip==20.2.4 usedevelop = True deps = -c{toxinidir}/upper-constraints.txt -- cgit 1.2.3-korg