From b51f344a3785ccf9fff5a9590419c5054493235e Mon Sep 17 00:00:00 2001
From: Jerry Zhao <zhaoxinyu@huawei.com>
Date: Mon, 26 Jan 2015 21:42:54 -0800
Subject: [PATCH] unpin versions of python-daemon, paramiko, etc

python-daemon 2.0.4 has fixed issue related to setuptools, so revert
the pin but excludes broken versions.
since we have moved compass-core, tempest into virtualenv, it is also not
necessary to pin other package versions to be compatbile with tempest.
Pin MarkDown to <2.5 because py26 is not supported otherwise.
python-daemon also needs a new pip that comes with new virtualenv.

Change-Id: I7f378f344ef2e232c10e77725202acb09b3c3393
---
 install/dependency.sh | 2 +-
 install/prepare.sh    | 1 +
 requirements.txt      | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/install/dependency.sh b/install/dependency.sh
index bcd073b3..62daddb5 100755
--- a/install/dependency.sh
+++ b/install/dependency.sh
@@ -27,7 +27,7 @@ if [[ "$?" != "0" ]]; then
 fi
 
 sudo pip install --upgrade setuptools
-
+sudo pip install --upgrade virtualenv
 sudo easy_install --upgrade pip
 if [[ "$?" != "0" ]]; then
     echo "failed to install easy install"
diff --git a/install/prepare.sh b/install/prepare.sh
index 95b5f62f..4b9ec4c1 100755
--- a/install/prepare.sh
+++ b/install/prepare.sh
@@ -217,6 +217,7 @@ if ! lsvirtualenv |grep compass-core>/dev/null; then
 fi
 cd $COMPASSDIR
 workon compass-core
+easy_install --upgrade pip
 rm -rf ${WORKON_HOME}/compass-core/build
 echo "install compass requirements"
 pip install -U -r requirements.txt
diff --git a/requirements.txt b/requirements.txt
index d7aaabbe..87e26a4a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
 amqplib
 argparse
 celery
-Markdown==2.4.1
-Cheetah==2.4.1
+Markdown<2.5
+Cheetah<=2.4.1
 daemon
 Flask
 Flask-Login
@@ -16,9 +16,9 @@ lazypy
 lockfile
 MySQL-python
 netaddr
-paramiko==1.7.5
+paramiko
 PyChef
-python-daemon==1.6.1
+python-daemon!=2.0,!=2.0.1,!=2.0.2,!=2.0.3
 SQLAlchemy>=0.9.0
 simplejson
 requests