You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/03/23 15:58:36 UTC
[7/9] git commit: refs/heads/bvt - marvin-nose: include the plugin as
part of marvin install
marvin-nose: include the plugin as part of marvin install
No need to register the plugin seperately now. The installer will
register with nose's entry_point automatically.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6f2d0923
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6f2d0923
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6f2d0923
Branch: refs/heads/bvt
Commit: 6f2d092365458a9028a1fd992886561f0da82c46
Parents: 7f6e817
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Sat Mar 23 20:25:21 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sat Mar 23 20:25:21 2013 +0530
----------------------------------------------------------------------
tools/marvin/setup.py | 58 +++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6f2d0923/tools/marvin/setup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index f8198d7..ab5eb6f 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -16,27 +16,41 @@
# specific language governing permissions and limitations
# under the License.
-from setuptools import setup
-from sys import version
-import sys
+try:
+ from setuptools import setup, find_packages
+except ImportError:
+ from distribute_setup import use_setuptools
+ use_setuptools()
+ from setuptools import setup, find_packages
+
+VERSION = '0.1.0'
+
+import os
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read().strip()
setup(name="Marvin",
- version="0.1.0",
- description="Marvin - Python client for testing cloudstack",
- author="Edison Su",
- author_email="Edison.Su@citrix.com",
- maintainer="Prasanna Santhanam",
- maintainer_email="Prasanna.Santhanam@citrix.com",
- long_description="Marvin is the cloudstack testclient written around the python unittest framework",
- platforms=("Any",),
- url="http://jenkins.cloudstack.org:8080/job/marvin",
- packages=["marvin", "marvin.cloudstackAPI", "marvin.integration",
- "marvin.integration.lib", "marvin.sandbox",
- "marvin.sandbox.advanced", "marvin.sandbox.basic"],
- license="LICENSE.txt",
- install_requires=[
- "mysql-connector-python",
- "paramiko",
- "nose"
- ],
- )
+ version=VERSION,
+ description="Marvin - Python client for Apache CloudStack",
+ author="Edison Su",
+ author_email="Edison.Su@citrix.com",
+ maintainer="Prasanna Santhanam",
+ maintainer_email="Prasanna.Santhanam@citrix.com",
+ 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/",
+ packages=["marvin", "marvin.cloudstackAPI", "marvin.integration",
+ "marvin.integration.lib", "marvin.sandbox",
+ "marvin.sandbox.advanced", "marvin.sandbox.basic"],
+ license="LICENSE.txt",
+ install_requires=[
+ "mysql-connector-python",
+ "paramiko",
+ "nose"
+ ],
+ py_modules=['marvin.marvinPlugin'],
+ zip_safe=False,
+ entry_points={
+ 'nose.plugins': ['marvinPlugin = marvin.marvinPlugin:MarvinPlugin']
+ },
+)