aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-12-10 18:44:20 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2020-12-10 18:51:47 +0100
commita62568c8ac1cc23f8d830b444d964fc4d665e7b0 (patch)
treee5d469e53a43910ca764c8bbc8869746426e9ee6
parent6ed1a04423d9c6423061bc19b01988edb8464a93 (diff)
Use pip==20.2.4 in tox venv
pip 20.3 is disruptive and would lead to big changes in stable branches. Change-Id: I33079e7d667e42240fcc497d595509e88da3c4f7 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 622f1921e9d3850b4d190fe8c8508c196fcf450b)
-rw-r--r--.circleci/config.yml2
-rw-r--r--.travis.yml2
-rw-r--r--tox.ini1
3 files changed, 3 insertions, 2 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 52a4bede8..22b2a995c 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 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 d1c2cf51d..e6b405c22 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.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 7284fc496..87c7efa5f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,bandit,py27,py36,cover,perm
[testenv]
+pip_version = pip==20.2.4
usedevelop = True
deps =
-c{toxinidir}/upper-constraints.txt