From b7138653085c255a7100349ed5e87982be4a721b Mon Sep 17 00:00:00 2001
From: Rohit Yadav <bhaisaab@apache.org>
Date: Tue, 6 Nov 2012 16:07:42 +0530
Subject: [PATCH] cli: pip install cloudmonkey works

Patch makes cloudmonkey installable and redistributable using source dist from
pypi under apache compliant license. Most visible issues have been solved and
cloudmonkey should work well with CloudStack 4.0 and master, also until APIs do
not change.

To install now:
    pip install cloudmonkey

or, if you have to:
    easy_install cloudmonkey

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
---
 tools/cli/cloudmonkey/__init__.py |  5 -----
 tools/cli/setup.py                | 14 +++++++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/tools/cli/cloudmonkey/__init__.py b/tools/cli/cloudmonkey/__init__.py
index e66b2b9e6b0..70e5d50ca8d 100644
--- a/tools/cli/cloudmonkey/__init__.py
+++ b/tools/cli/cloudmonkey/__init__.py
@@ -15,11 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# Use following rules for versioning:
-# <cli major version>.<cloudstack minor version>.<cloudstack major version>
-# Example: For CloudStack 4.1.x, CLI version should be 0.1.4
-__version__ = "0.0.4"
-
 try:
     from cloudmonkey import *
 except ImportError, e:
diff --git a/tools/cli/setup.py b/tools/cli/setup.py
index fdbdb2ba0d3..9cf6b1789e9 100644
--- a/tools/cli/setup.py
+++ b/tools/cli/setup.py
@@ -22,10 +22,11 @@ except ImportError:
     use_setuptools()
     from setuptools import setup, find_packages
 
-from cloudmonkey import __version__
-
-name = 'cloudmonkey'
-version = __version__
+# Use following rules for versioning:
+# <cli major version>.<cloudstack minor version>.<cloudstack major version>
+# Example: For CloudStack 4.1.x, CLI version should be 0.1.4
+version = "0.0.4"
+name = "cloudmonkey"
 
 setup(
     name = name,
@@ -36,9 +37,12 @@ setup(
     maintainer_email = "bhaisaab@apache.org",
     url = "http://incubator.apache.org/cloudstack",
     description = "Command Line Interface for Apache CloudStack",
+    long_description="cloudmonkey is a command line interface for Apache "
+                     "CloudStack powered by CloudStack Marvin testclient",
+    platforms=("Any",),
     license = 'ASL 2.0',
     packages=find_packages(),
-    install_requires=['clint'],
+    install_requires=['clint>=0.3.0'],
     include_package_data = True,
     zip_safe = False,
     classifiers = [