You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2013/03/21 06:22:10 UTC
[23/50] [abbrv] git commit: refs/heads/cisco-vnmc-api-integration -
cli: Import project info from config in setup.py, fix debug msgs
cli: Import project info from config in setup.py, fix debug msgs
Signed-off-by: Rohit Yadav <bh...@apache.org>
lsdfjk
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/19a29050
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/19a29050
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/19a29050
Branch: refs/heads/cisco-vnmc-api-integration
Commit: 19a290500e17765a67eddc0d61769e483ee3d7f7
Parents: 4421f2b
Author: Rohit Yadav <bh...@apache.org>
Authored: Tue Mar 19 15:52:03 2013 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Tue Mar 19 16:05:11 2013 +0530
----------------------------------------------------------------------
tools/cli/cloudmonkey/__init__.py | 4 ++-
tools/cli/cloudmonkey/cloudmonkey.py | 2 -
tools/cli/setup.py | 34 +++++++++++++---------------
3 files changed, 19 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/19a29050/tools/cli/cloudmonkey/__init__.py
----------------------------------------------------------------------
diff --git a/tools/cli/cloudmonkey/__init__.py b/tools/cli/cloudmonkey/__init__.py
index e4c4e6d..cf689e7 100644
--- a/tools/cli/cloudmonkey/__init__.py
+++ b/tools/cli/cloudmonkey/__init__.py
@@ -16,6 +16,8 @@
# under the License.
try:
- from config import __version__
+ from config import __version__, __description__
+ from config import __maintainer__, __maintaineremail__
+ from config import __project__, __projecturl__, __projectemail__
except ImportError, e:
print e
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/19a29050/tools/cli/cloudmonkey/cloudmonkey.py
----------------------------------------------------------------------
diff --git a/tools/cli/cloudmonkey/cloudmonkey.py b/tools/cli/cloudmonkey/cloudmonkey.py
index f88632d..f750c3a 100644
--- a/tools/cli/cloudmonkey/cloudmonkey.py
+++ b/tools/cli/cloudmonkey/cloudmonkey.py
@@ -484,8 +484,6 @@ def main():
help="prints cloudmonkey version information")
(options, args) = parser.parse_args()
- print 'args', args
- print 'options', options
if options.version:
print "cloudmonkey", __version__
print __description__, "(%s)" % __projecturl__
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/19a29050/tools/cli/setup.py
----------------------------------------------------------------------
diff --git a/tools/cli/setup.py b/tools/cli/setup.py
index 9624115..4c7b297 100644
--- a/tools/cli/setup.py
+++ b/tools/cli/setup.py
@@ -22,13 +22,9 @@ except ImportError:
use_setuptools()
from setuptools import setup, find_packages
-from cloudmonkey import __version__
-
-name = 'cloudmonkey'
-version = __version__
-requires = ['Pygments>=1.5',
- 'prettytable>=0.6',
- ]
+from cloudmonkey import __version__, __description__
+from cloudmonkey import __maintainer__, __maintaineremail__
+from cloudmonkey import __project__, __projecturl__, __projectemail__
try:
import readline
@@ -36,20 +32,22 @@ except ImportError:
requires.append('readline')
setup(
- name = name,
- version = version,
- author = "The Apache CloudStack Team",
- author_email = "cloudstack-dev@incubator.apache.org",
- maintainer = "Rohit Yadav",
- 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",
+ name = 'cloudmonkey',
+ version = __version__,
+ author = __project__,
+ author_email = __projectemail__,
+ maintainer = __maintainer__,
+ maintainer_email = __maintaineremail__,
+ url = __projecturl__,
+ description = __description__,
+ long_description = "cloudmonkey is a CLI for Apache CloudStack",
platforms = ("Any",),
license = 'ASL 2.0',
packages = find_packages(),
- install_requires = requires,
+ install_requires = [
+ 'Pygments>=1.5',
+ 'prettytable>=0.6',
+ ],
include_package_data = True,
zip_safe = False,
classifiers = [