X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=setup.py;h=48f00f47ce6e2854b5e0a0a1207d5a9fc6246140;hb=a33f57371c740e0ab749bfffa4d31c08ef5c5b74;hp=742192c6f1192bee1f1d373d24b41189a5646430;hpb=fa7bf41e69214d73b756b68fb58ec57dc6e208be;p=yardstick.git

diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index 742192c6f..48f00f47c
--- a/setup.py
+++ b/setup.py
@@ -1,19 +1,33 @@
-import ez_setup
 from setuptools import setup, find_packages
 
-ez_setup.use_setuptools()
 
 setup(
     name="yardstick",
     version="0.1.dev0",
     packages=find_packages(),
     include_package_data=True,
-    package_data={'yardstick': ['benchmark/scenarios/networking/*.bash']},
+    package_data={
+        'yardstick': [
+            'benchmark/scenarios/availability/attacker/*.yaml',
+            '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=["backport_ipaddress",  # remove with python3
+                      "coverage>=3.6",
                       "flake8",
+                      "Jinja2>=2.6",
+                      "lxml",
                       "PyYAML>=3.10",
-                      "pbr!=0.7,<1.0,>=0.6",
+                      "pbr<2.0,>=1.3",
                       "python-glanceclient>=0.12.0",
                       "python-heatclient>=0.2.12",
                       "python-keystoneclient>=0.11.1",
@@ -21,11 +35,19 @@ setup(
                       "python-novaclient>=2.24.1",
                       "mock>=1.0.1",  # remove with python3
                       "paramiko",
-                      "six"
+                      "netifaces",
+                      "scp",
+                      "six",
+                      "testrepository>=0.0.18",
+                      "testtools>=1.4.0"
                       ],
+    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']