Fix osm-common and osm-im dependencies to use v9.0

The dependencies in requirements.txt were pointing to master
instead of pointing to v9.0. With the recent changes in the
repos, osm-common and osm-im in master did not have dependencies,
so the error raised.

The file setup.py was also updated because it was enough to specify
the requirements there as 'osm-im' and 'osm-common'.

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

diff --git a/requirements.txt b/requirements.txt
index b51ddca..8aa4351 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,7 +15,7 @@ jsonschema>=3.2.0
 PyYAML
 python-keystoneclient
 requests
-git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common
-git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im
+git+https://osm.etsi.org/gerrit/osm/common.git@v9.0#egg=osm-common
+git+https://osm.etsi.org/gerrit/osm/IM.git@v9.0#egg=osm-im
 aiohttp>=2.3.10,<=3.6.2
 tacacs_plus

diff --git a/setup.py b/setup.py
index 309dda1..14e4324 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -49,10 +49,10 @@ setup(
     #             ],
     install_requires=[
         'CherryPy>=18.1.2',
-        'osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common',
+        'osm-common',
         'jsonschema>=3.2.0',
         'PyYAML',
-        'osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im',
+        'osm-im',
         'python-keystoneclient',
         'requests',
         'aiohttp>=2.3.10,<=3.6.2',