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/04/12 15:11:48 UTC
git commit: updated refs/heads/marvin_refactor to 5b079c6
Updated Branches:
refs/heads/marvin_refactor 30e297134 -> 5b079c6c0
marvin: fix the setup.py for marvin to include factories
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/5b079c6c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5b079c6c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5b079c6c
Branch: refs/heads/marvin_refactor
Commit: 5b079c6c01bfed846ca8b7a25352ee68f74ff026
Parents: 30e2971
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Apr 12 18:41:08 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Apr 12 18:41:08 2013 +0530
----------------------------------------------------------------------
tools/marvin/setup.py | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b079c6c/tools/marvin/setup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index ab5eb6f..8040c62 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -40,13 +40,15 @@ setup(name="Marvin",
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"],
+ "marvin.integration.lib", "marvin.integration.lib.base", "marvin.integration.lib.factory",
+ "marvin.sandbox", "marvin.sandbox.advanced", "marvin.sandbox.basic"],
license="LICENSE.txt",
install_requires=[
"mysql-connector-python",
"paramiko",
- "nose"
+ "nose",
+ "factory_boy",
+ "should-dsl"
],
py_modules=['marvin.marvinPlugin'],
zip_safe=False,