From: garciadeblas Date: Thu, 8 Apr 2021 20:22:16 +0000 (+0200) Subject: Fix osm-common and RO-plugin dependencies to use v9.0 X-Git-Tag: branch-bug1511-start X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Ftags%2Fbranch-bug1511-start;hp=42f80771cddb63ecd78cf9b831e721b018779dc9;p=osm%2FRO.git 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 --- diff --git a/NG-RO/requirements.txt b/NG-RO/requirements.txt index c9d56cb6..1ff0d6f8 100644 --- 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 31c3b358..4749cd4b 100644 --- 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"], )