X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=setup.py;h=a6848ec638a158feca8cf4fdf08c790677c06466;hb=d03858bbac357b6d705c7137d2d20d5c8e34ecc6;hp=fee8f3c25ae191409be140e7b527a7b119d36be5;hpb=39ace1211d91d83aff8c06f9db88126cc2ec6588;p=yardstick.git

diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index fee8f3c25..a6848ec63
--- 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,16 +8,18 @@ setup(
     include_package_data=True,
     package_data={
         'yardstick': [
+            'benchmark/scenarios/compute/*.bash',
             'benchmark/scenarios/networking/*.bash',
             'benchmark/scenarios/storage/*.bash',
             'resources/files/*'
-         ]
+        ]
     },
     url="https://www.opnfv.org",
     install_requires=["backport_ipaddress",  # remove with python3
                       "flake8",
+                      "Jinja2>=2.6",
                       "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",
@@ -27,11 +27,16 @@ setup(
                       "python-novaclient>=2.24.1",
                       "mock>=1.0.1",  # remove with python3
                       "paramiko",
-                      "six"
+                      "six",
+                      "testrepository>=0.0.18"
                       ],
+    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']