commit cf92004692dbcab4b9c024a45be327f7bf019ea8
author garciadeblas <gerardo.garciadeblas@telefonica.com> Thu Sep 14 16:17:39 2017 +0200
committer garciadeblas <gerardo.garciadeblas@telefonica.com> Fri Sep 15 14:33:10 2017 +0200
tree 7f9d1849ed367292c03710b2bf0c3e65de6c1eae
parent 952ab00df253f7ae43d44f2f7ba2dfef0ef0d9b8

OSM IM consumed, changes in devops-related files: Makefile, Dockerfile, setup, new tox.ini

Change-Id: Iff96eaf1a718a205b1e53c84d3f555bef8818716
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

setup.py

diff --git a/setup.py b/setup.py
index 303a652..70cefd4 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,6 @@
 #import glob
 
 _name = 'osm_ro'
-_version = open('RO_VERSION').read().strip()
 _description = 'OSM Resource Orchestrator'
 _author = 'ETSI OSM'
 _author_email = 'alfonso.tiernosepulveda@telefonica.com'
@@ -18,7 +17,8 @@
 _requirements = [
     "PyYAML",
     "bottle",
-    "MySQL-python",
+    #"mysqlclient",
+    #"MySQLdb",
     "jsonschema",
     "paramiko",
     "argcomplete",
@@ -30,15 +30,17 @@
     "python-glanceclient",
     "python-neutronclient",
     "python-cinderclient",
-    "pyvcloud",
-    "progressbar",
+    #"pyvcloud",
+    #"progressbar",
     "prettytable",
-    "pyvmomi",
+    #"pyvmomi",
     "boto",
+    #"lib_osm_openvim",
+    #"osm_im",
 ]
 
 setup(name=_name,
-      version = _version,
+      version_command=('git describe', 'pep440-git'),
       description = _description,
       long_description = open('README.rst').read(),
       author = _author,
@@ -60,5 +62,7 @@
       scripts=['openmanod', 'openmano', 'osm_ro/scripts/service-openmano', 'osm_ro/scripts/openmano-report',],
       install_requires=_requirements,
       include_package_data=True,
+      setup_requires=['setuptools-version-command'],
+      #test_suite='nose.collector',
       )