X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=setup.py;h=8b37943eaba2a8392455bef707f7092cd8a7d41d;hb=f8b52ec5839c804be2f866393462f85f530160d9;hp=8c16c56ea932bf585776f6a38dc16b01e1853422;hpb=2d131cd335b35914133d3dd8d1d8f5741fc38eb0;p=yardstick.git

diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index 8c16c56ea..8b37943ea
--- a/setup.py
+++ b/setup.py
@@ -1,24 +1,58 @@
-import ez_setup
 from setuptools import setup, find_packages
 
-ez_setup.use_setuptools()
 
 setup(
     name="yardstick",
-    version="0.1dev",
+    version="0.1.dev0",
     packages=find_packages(),
-    scripts=['bin/yardstick'],
     include_package_data=True,
+    package_data={
+        'yardstick': [
+            'benchmark/scenarios/availability/*.yaml',
+            'benchmark/scenarios/availability/attacker/*.yaml',
+            'benchmark/scenarios/availability/ha_tools/*.bash',
+            'benchmark/scenarios/availability/attacker/scripts/*.bash',
+            'benchmark/scenarios/availability/monitor/*.yaml',
+            'benchmark/scenarios/availability/monitor/script_tools/*.bash',
+            'benchmark/scenarios/compute/*.bash',
+            'benchmark/scenarios/networking/*.bash',
+            'benchmark/scenarios/networking/*.txt',
+            'benchmark/scenarios/parser/*.sh',
+            'benchmark/scenarios/storage/*.bash',
+            'resources/files/*'
+        ]
+    },
     url="https://www.opnfv.org",
-    install_requires=["flake8",
+    install_requires=["backport_ipaddress",  # remove with python3
+                      "coverage>=3.6",
+                      "flake8",
+                      "Jinja2>=2.6",
+                      "lxml",
                       "PyYAML>=3.10",
+                      "pbr<2.0,>=1.3",
+                      "python-openstackclient>=2.1.0",
                       "python-glanceclient>=0.12.0",
                       "python-heatclient>=0.2.12",
                       "python-keystoneclient>=0.11.1",
                       "python-neutronclient>=2.3.9",
                       "python-novaclient>=2.24.1",
-                      "mock>=1.0.1",
+                      "mock>=1.0.1",  # remove with python3
                       "paramiko",
-                      "six"
+                      "netifaces",
+                      "scp",
+                      "six",
+                      "testrepository>=0.0.18",
+                      "testtools>=1.4.0",
+                      "nose"
                       ],
+    extras_require={
+        'plot': ["matplotlib>=1.4.2"]
+    },
+    entry_points={
+        'console_scripts': [
+            'yardstick=yardstick.main:main',
+            'yardstick-plot=yardstick.plot.plotter:main [plot]'
+        ],
+    },
+    scripts=['tools/yardstick-img-modify']
 )