From 3661d3dec5df9fb8b46cc1f40e9cc75868c61695 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Thu, 10 Dec 2020 18:44:20 +0100 Subject: [PATCH] Use pip==20.2.4 in tox venv MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit pip 20.3 is disruptive and would lead to big changes in stable branches. Change-Id: I33079e7d667e42240fcc497d595509e88da3c4f7 Signed-off-by: Cédric Ollivier (cherry picked from commit 622f1921e9d3850b4d190fe8c8508c196fcf450b) --- .circleci/config.yml | 4 ++-- .travis.yml | 2 +- tox.ini | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b5a0a78d..b8cad21cf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,10 +8,10 @@ jobs: - checkout - run: name: Install dependendencies - command: sudo apt-get update && sudo apt-get install python2.7-dev enchant + command: sudo apt-get update && sudo apt-get install enchant - 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 3ef017c04..d479ce52f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ before_script: - sudo add-apt-repository -y ppa:deadsnakes/ppa - sudo apt-get update - sudo apt-get install python3.7 python3.7-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 ddd02318d..d4e85d797 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,7 @@ envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,bandit,py37,cover,perm [testenv] +pip_version = pip==20.2.4 usedevelop = True deps = -c{toxinidir}/upper-constraints.txt -- 2.16.6