X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=setup.py;h=eb55e92832271aae400dce228f46dc196bf4e833;hb=9553328d81a46bb7f0c185661f07c68f0fff20df;hp=7adaa05dc27a6bd9e6b3fdc461fabab7c44eaaa7;hpb=6b667910909b332e78105ccdf17e39e4b286ed39;p=yardstick.git

diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index 7adaa05dc..eb55e9283
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,5 @@
-import ez_setup
 from setuptools import setup, find_packages
 
-ez_setup.use_setuptools()
 
 setup(
     name="yardstick",
@@ -10,15 +8,26 @@ setup(
     include_package_data=True,
     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/storage/*.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",
@@ -26,11 +35,20 @@ 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"
+                      "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']