aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRex Lee <limingjiang@huawei.com>2018-03-21 08:18:24 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-21 08:18:24 +0000
commite345f4757abda2e7e734d86d89024d7af6e17de9 (patch)
treef3e717f7c13d7dfcb5177c54ab80a1c3b6f9f637
parenta854a1dde960b630c0c0d854dee9232e4c4e9ac8 (diff)
parent348167d3301ade14c12d9b26f138c94afece170a (diff)
Merge "Enforce pip version during installation"
-rwxr-xr-xinstall.sh2
-rw-r--r--requirements.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/install.sh b/install.sh
index 5cd83677b..1dbf64ddf 100755
--- a/install.sh
+++ b/install.sh
@@ -96,7 +96,7 @@ git config --global http.sslVerify false
# install yardstick + dependencies
-easy_install -U pip
+easy_install -U pip==9.0.1
pip install -r requirements.txt
pip install -e .
diff --git a/requirements.txt b/requirements.txt
index d45e4b149..409bcd8c1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -43,7 +43,7 @@ oslo.utils==3.28.0 # OSI Approved Apache Software License
paramiko==2.2.1 # LGPL; OSI Approved GNU Library or Lesser General Public License (LGPL)
pbr==3.1.1 # OSI Approved Apache Software License; Apache License, Version 2.0
pika==0.10.0 # BSD; OSI Approved BSD License
-pip==9.0.1;python_version=='2.7' # MIT
+pip==9.0.1 # MIT
positional==1.1.2 # OSI Approved Apache Software License
pycrypto==2.6.1 # Public Domain
pyparsing==2.2.0 # MIT License; OSI Approved MIT License