Fix osm-common and RO-plugin 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 RO-plugin do not have dependencies,
so errors might appear if this change is not applied.

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

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

diff --git a/NG-RO/requirements.txt b/NG-RO/requirements.txt
index c9d56cb..1ff0d6f 100644 (file)
--- a/NG-RO/requirements.txt
+++ b/NG-RO/requirements.txt
@@ -14,8 +14,8 @@
 
 PyYAML
 CherryPy==18.1.2
-osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common
+osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@v9.0#egg=osm-common
 requests
 cryptography
-osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
+osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v9.0#egg=osm-ro-plugin&subdirectory=RO-plugin
 logutils

diff --git a/NG-RO/setup.py b/NG-RO/setup.py
index 31c3b35..4749cd4 100644 (file)
--- a/NG-RO/setup.py
+++ b/NG-RO/setup.py
@@ -38,12 +38,12 @@ setup(
     include_package_data=True,
     install_requires=[
         "CherryPy==18.1.2",
-        "osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common",
+        "osm-common",
         "jsonschema",
         "PyYAML",
         "requests",
         "cryptography",  # >=2.5  installed right version with the debian post-install script
-        "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin",
+        "osm-ro-plugin",
     ],
     setup_requires=["setuptools-version-command"],
 )