Updated Branches: refs/heads/master 009749fb7 -> b798c4511
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 <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/9c755e11 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9c755e11 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9c755e11 Branch: refs/heads/master Commit: 9c755e11e5067bfbc14581a3a3fac9b5b7fd21a1 Parents: 2e2046f Author: Prasanna Santhanam <t...@apache.org> Authored: Sat Mar 23 20:25:21 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Tue Apr 2 18:31:29 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/setup.py | 52 --------------------------------- tools/marvin/setup.py | 58 +++++++++++++++++++++++-------------- 2 files changed, 36 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c755e11/tools/marvin/marvin/setup.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/setup.py b/tools/marvin/marvin/setup.py deleted file mode 100644 index 07ff5b5..0000000 --- a/tools/marvin/marvin/setup.py +++ /dev/null @@ -1,52 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -import os -try: - from setuptools import setup, find_packages -except ImportError: - from distribute_setup import use_setuptools - use_setuptools() - from setuptools import setup, find_packages - - -def read(fname): - return open(os.path.join(os.path.dirname(__file__), fname)).read().strip() - -VERSION = '0.1.0' - -setup( - name = "marvin-nose", - version = VERSION, - author = "Prasanna Santhanam", - author_email = "prasanna.santha...@citrix.com", - description = "Run tests written using CloudStack's Marvin testclient", - license = 'ASL 2.0', - classifiers = [ - "Intended Audience :: Developers", - "Topic :: Software Development :: Testing", - "Programming Language :: Python", - ], - - py_modules = ['marvinPlugin'], - zip_safe = False, - - entry_points = { - 'nose.plugins': ['marvinPlugin = marvinPlugin:MarvinPlugin'] - }, - install_requires = ['nose', 'marvin'], -) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c755e11/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...@citrix.com", - maintainer="Prasanna Santhanam", - maintainer_email="prasanna.santha...@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...@citrix.com", + maintainer="Prasanna Santhanam", + maintainer_email="prasanna.santha...@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'] + }, +)
