From f0e6a736f8cc1f98e5f067b4e433f5af594e7c48 Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Thu, 29 Jun 2017 11:36:44 +0800 Subject: Fix python pkg issue 1 add install pyyaml in build process 2 fix python pkg version Change-Id: Icb40bd52aa6cd22874894047561acb9211abfa22 Signed-off-by: Harry Huang --- build.sh | 4 +++- deploy/prepare.sh | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/build.sh b/build.sh index 3665f6e2..0b91887d 100755 --- a/build.sh +++ b/build.sh @@ -17,7 +17,7 @@ echo $COMPASS_PATH REDHAT_REL=${REDHAT_REL:-"false"} -PACKAGES="curl" +PACKAGES="curl python-pip" mkdir -p $WORK_DIR $CACHE_DIR @@ -65,10 +65,12 @@ function prepare_env() if ! apt --installed list 2>/dev/null |grep "\<$i\>" then sudo apt-get install -y --force-yes $i + sudo pip install pyyaml fi fi if [[ $REDHAT_REL == true ]]; then sudo yum install $i -y + sudo pip install pyyaml fi done set -e diff --git a/deploy/prepare.sh b/deploy/prepare.sh index 553449eb..1da91a5f 100755 --- a/deploy/prepare.sh +++ b/deploy/prepare.sh @@ -102,16 +102,16 @@ function _prepare_python_env() { virtualenv $WORK_DIR/venv source $WORK_DIR/venv/bin/activate - pip install --upgrade cffi - pip install --upgrade MarkupSafe - pip install --upgrade pip - pip install --upgrade cheetah - pip install --upgrade pyyaml - pip install --upgrade requests - pip install --upgrade netaddr - pip install --upgrade oslo.config - pip install --upgrade ansible - sudo pip install --upgrade docker-compose + pip install cffi==1.10.0 + pip install MarkupSafe==1.0 + pip install pip==9.0.1 + pip install cheetah==2.4.4 + pip install pyyaml==3.12 + pip install requests==2.18.1 + pip install netaddr==0.7.19 + pip install oslo.config==4.6.0 + pip install ansible==2.3.1.0 + pip install docker-compose==1.14.0 fi } -- cgit 1.2.3-korg