aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-12-10 19:06:19 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2020-12-10 19:07:24 +0100
commit0636bc2c0941d44025d663f8bca425966093013b (patch)
treef0ce002a55041c337f68d9a1497f0ee157d102f7
parent072dc9b5dcdfe58766659c6f36698e1c331f0a67 (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: Ifc4abd2d1f28bfb63ba66796e1690b398c1e4760 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 9c9f1888d682cf1b794c956d7f6ab448cb42c6d7)
-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 f258e04a..fe645ecd 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 d92a5cb5..e4a584f4 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.8 python3.8-dev python3.8-distutils
- - 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 65b8b871..0c7de6c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,7 @@ envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,py27,py38,cover,perm
skipsdist = True
[testenv]
+pip_version = pip==20.2.4
usedevelop = True
deps =
-c{toxinidir}/upper-constraints.txt