From df39196bf77ac67129d8026075f7a71249f137e1 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Mon, 13 May 2013 11:20:38 +0530 Subject: [PATCH] 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 --- tools/marvin/setup.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py index da138ce162b..8dfd1b895d0 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.Su@citrix.com", maintainer="Prasanna Santhanam", - maintainer_email="Prasanna.Santhanam@citrix.com", + maintainer_email="tsp@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"],