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:48:03 +0100
commit3960162fe01ca19973ee109328ced8cb37cefd01 (patch)
tree0fee7587c553af20c506d39bd599f8868c51058e
parent2d2fcf12c1a263fc2b41af835c8f62d47990d77d (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.yml4
-rw-r--r--.travis.yml2
-rw-r--r--tox.ini1
3 files changed, 4 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index a5c8346ee..f2b3eb732 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 389dcdd34..cb0da7f10 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 enchant
- - 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 ed82d9342..d101637de 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,bandit,py38,cover,perm
[testenv]
+pip_version = pip==20.2.4
usedevelop = True
deps =
-c{toxinidir}/upper-constraints.txt