mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 20:02:29 +01:00
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 <tsp@apache.org>
This commit is contained in:
parent
6df3d83183
commit
df39196bf7
@ -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"],
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user