cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [1/2] git commit: refs/heads/bvt - remove the setup for marvin-nose
Date Mon, 25 Mar 2013 13:07:53 GMT
Updated Branches:
  refs/heads/bvt 1a31704c0 -> 3307dbaec


remove the setup for marvin-nose

marvin-nose registration step is included as part of marvin installation
now.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4fcc97ba
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4fcc97ba
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4fcc97ba

Branch: refs/heads/bvt
Commit: 4fcc97ba1652f305b8a1652cc01a26ae8eab4c80
Parents: 1a31704
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Mon Mar 25 15:36:57 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Mon Mar 25 15:36:57 2013 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/setup.py |   52 -------------------------------------
 1 files changed, 0 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4fcc97ba/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.Santhanam@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'],
-)


Mime
View raw message