summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2018-04-09 15:00:33 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2018-06-26 06:45:49 +0000
commit067a72e250f9eea8deed84348aef6681d305a160 (patch)
tree7d0b5603a0c4b0e1267038c3fcd8a3f6bbce99cf
parentc99cde8fc1f049e833cd316d932048af90d33667 (diff)
JIRA: - Avoid package problems brought by pip10 Change-Id: I082571ba71b6624f4b8f8a8b4a2a4eed9315cd10 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com> (cherry picked from commit 7a6fed1fe9795774236d6149cabaf559221401ce)
-rwxr-xr-xcompass-deck/build.sh2
-rw-r--r--compass-deck/requirements.txt1
-rwxr-xr-xcompass-tasks-base/build.sh2
-rw-r--r--compass-tasks-base/requirements.txt1
4 files changed, 2 insertions, 4 deletions
diff --git a/compass-deck/build.sh b/compass-deck/build.sh
index 6049eb9..c9d3922 100755
--- a/compass-deck/build.sh
+++ b/compass-deck/build.sh
@@ -21,7 +21,7 @@ rm -rf $COMPASS_DIR/../compass-web/.git
easy_install --upgrade pip
easy_install --upgrade six
-pip install --upgrade pip
+pip install --upgrade pip==9.0.1
pip install --upgrade setuptools
pip install --upgrade virtualenv
pip install --upgrade redis
diff --git a/compass-deck/requirements.txt b/compass-deck/requirements.txt
index 5509845..6a3b3c7 100644
--- a/compass-deck/requirements.txt
+++ b/compass-deck/requirements.txt
@@ -1,4 +1,3 @@
-pip==9.0.1
amqplib
argparse
celery
diff --git a/compass-tasks-base/build.sh b/compass-tasks-base/build.sh
index 20fa79e..81f3c21 100755
--- a/compass-tasks-base/build.sh
+++ b/compass-tasks-base/build.sh
@@ -36,7 +36,7 @@ echo "UserKnownHostsFile /dev/null" >> /root/.ssh/config;
echo "StrictHostKeyChecking no" >> /root/.ssh/config
easy_install --upgrade pip
-pip install --upgrade pip
+pip install --upgrade pip==9.0.1
pip install --upgrade setuptools
pip install --upgrade Flask
pip install --upgrade virtualenvwrapper
diff --git a/compass-tasks-base/requirements.txt b/compass-tasks-base/requirements.txt
index c952986..4f88b54 100644
--- a/compass-tasks-base/requirements.txt
+++ b/compass-tasks-base/requirements.txt
@@ -1,4 +1,3 @@
-pip==9.0.1
amqplib
argparse
celery