aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>2018-03-20 14:26:09 +0000
committerRodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>2018-03-20 14:42:31 +0000
commit348167d3301ade14c12d9b26f138c94afece170a (patch)
treea7dba5fc570b1dda9e796f3e708c74a2b4e4586b
parent5f61719a12ff20df3679d01578de84110f68302f (diff)
Enforce pip version during installation
Currently there is a reported problem in pip library [1]. To avoid this problem, the pip version should be enforced during the installation. [1]https://github.com/pypa/pip/issues/5079 JIRA: YARDSTICK-1087 Change-Id: I2ee28749f146cd3b0e1bf4ed92b51cbe6db8b2f3 Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
-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