Updated Branches: refs/heads/master 6df3d8318 -> df39196bf
marvin: build fails when no setuptools/distribute found appropriately warn the user to install setuptools. Also - fixed the jenkins url for builds.a.o Signed-off-by: Prasanna Santhanam <t...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/df39196b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/df39196b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/df39196b Branch: refs/heads/master Commit: df39196bf77ac67129d8026075f7a71249f137e1 Parents: 6df3d83 Author: Prasanna Santhanam <t...@apache.org> Authored: Mon May 13 11:20:38 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Mon May 13 11:21:38 2013 +0530 ---------------------------------------------------------------------- tools/marvin/setup.py | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/df39196b/tools/marvin/setup.py ---------------------------------------------------------------------- diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py index da138ce..8dfd1b8 100644 --- a/tools/marvin/setup.py +++ b/tools/marvin/setup.py @@ -19,9 +19,13 @@ try: from setuptools import setup, find_packages except ImportError: - from distribute_setup import use_setuptools - use_setuptools() - from setuptools import setup, find_packages + try: + from distribute_setup import use_setuptools + use_setuptools() + from setuptools import setup, find_packages + except ImportError: + raise RuntimeError("python setuptools is required to build Marvin") + VERSION = '0.1.0' @@ -35,10 +39,10 @@ setup(name="Marvin", author="Edison Su", author_email="edison...@citrix.com", maintainer="Prasanna Santhanam", - maintainer_email="prasanna.santha...@citrix.com", + maintainer_email="t...@apache.org", long_description="Marvin is the Apache CloudStack python client written around the unittest framework", platforms=("Any",), - url="https://builds.apache.org/view/CloudStack/job/cloudstack-marvin/";, + url="https://builds.apache.org/job/cloudstack-marvin/";, packages=["marvin", "marvin.cloudstackAPI", "marvin.integration", "marvin.integration.lib", "marvin.sandbox", "marvin.sandbox.advanced", "marvin.sandbox.basic"],
