aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-12-10 19:11:46 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2020-12-10 19:15:18 +0100
commitbfcbc700f1981f359030f4baf89bd408ad07b1ea (patch)
treeb6986967293d59ce00ccd59558152c835aaed1bf
parent1a07d388cb13639fe8a4653ed92e30af30778ec7 (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: Ic3770f4098c52b0d26bc62291c9e79e8ee81d107 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 0c99749bb65cadd0142c90cd73e13802d48cb7f6)
-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 7d4c4b4a..b8e0fe99 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: cover
destination: cover
diff --git a/.travis.yml b/.travis.yml
index f1c504dc..4f855884 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
- 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 dbf22e65..b62b2c3b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
envlist = pep8,pylint,yamllint,ansiblelint,bashate,py27,py36,bandit
[testenv]
+pip_version = pip==20.2.4
usedevelop = True
deps =
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=stable/hunter