X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=setup.py;h=ddce5cd22d30c23bfa08acf72e712658c411a43a;hb=c76a3eee8272c5f3c66f43b8eafe2c48273ee0c7;hp=20b6c3a48ee662c535872b382d69c06974e586c8;hpb=cf1826b8466193d53981fe6c61d78e9746b816f1;p=osm%2FRO.git

diff --git a/setup.py b/setup.py
index 20b6c3a4..ddce5cd2 100755
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 
+#from distutils.core import setup
+#from distutils.command.install_data import install_data
 from setuptools import setup
-from setuptools.command.install import install
 from os import system
 #import glob
 
 _name = 'osm_ro'
-_version = '1.0.0'
 _description = 'OSM Resource Orchestrator'
 _author = 'ETSI OSM'
 _author_email = 'alfonso.tiernosepulveda@telefonica.com'
@@ -17,32 +17,32 @@ _url = 'https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary'
 _requirements = [
     "PyYAML",
     "bottle",
-    "MySQL-python",
+    #"mysqlclient",
+    #"MySQLdb",
     "jsonschema",
     "paramiko",
     "argcomplete",
     "requests",
     "logutils",
+    "python-openstackclient",
     "python-novaclient",
     "python-keystoneclient",
     "python-glanceclient",
     "python-neutronclient",
     "python-cinderclient",
-    "pyvcloud",
-    "progressbar",
+    #"pyvcloud",
+    #"progressbar",
     "prettytable",
-    "pyvmomi",
+    #"pyvmomi",
     "boto",
+    #"lib_osm_openvim",
+    #"osm_im",
+    "pycrypto",
+    "netaddr",
 ]
 
-class ROInstaller(install):
-    def run(self):
-        cmd = 'echo "Running install script"'
-        system(cmd)
-        install.run(self)
-
 setup(name=_name,
-      version = _version,
+      version_command=('git describe --match v*', 'pep440-git-full'),
       description = _description,
       long_description = open('README.rst').read(),
       author = _author,
@@ -57,13 +57,15 @@ setup(name=_name,
       package_data = {_name: ['vnfs/*.yaml', 'vnfs/examples/*.yaml',
                          'scenarios/*.yaml', 'scenarios/examples/*.yaml',
                          'instance-scenarios/examples/*.yaml', 'database_utils/*',
-                         'scripts/install-openmano*.sh']},
-      data_files = [('/etc/osm/', ['openmanod.cfg']),
-                   ('/etc/systemd/system/', ['osm-ro.service']),
+                         'scripts/*']},
+      data_files = [('/etc/osm/', ['osm_ro/openmanod.cfg']),
+                   ('/etc/systemd/system/', ['osm_ro/osm-ro.service']),
                    ],
-      scripts=['openmanod', 'openmano', 'osm_ro/scripts/service-openmano.sh', 'osm_ro/scripts/openmano-report.sh',],
+      scripts=['openmanod', 'openmano', 'osm_ro/scripts/service-openmano', 'osm_ro/scripts/openmano-report',
+          'osm_ro/scripts/RO-start.sh'],
       install_requires=_requirements,
       include_package_data=True,
-      cmdclass = {'install': ROInstaller},
+      setup_requires=['setuptools-version-command'],
+      #test_suite='nose.collector',
       )