X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=setup.py;h=a8e9ccd8609397ac58225fe6b1b2d79d2404902d;hb=refs%2Fchanges%2F93%2F3493%2F5;hp=ff415aecd414e14d70e72763d6ffd4ef6fdf669d;hpb=f68ce570fd0eefb17bfc9e1e75c57b24050db89e;p=yardstick.git

diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index ff415aecd..a8e9ccd86
--- a/setup.py
+++ b/setup.py
@@ -1,31 +1,46 @@
-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/ha_tools/*.bash',
+            'benchmark/scenarios/compute/*.bash',
+            'benchmark/scenarios/networking/*.bash',
+            '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",
                       "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",
                       "python-neutronclient>=2.3.9",
                       "python-novaclient>=2.24.1",
-                      "mock>=1.0.1",
+                      "mock>=1.0.1",  # remove with python3
                       "paramiko",
-                      "six"
+                      "six",
+                      "testrepository>=0.0.18",
+                      "testtools>=1.4.0"
                       ],
-    entry_points = {
+    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']
+    scripts=['tools/yardstick-img-modify']
 )