From e5a75ba171ea534303e078171934532666c5fc90 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 8 Apr 2021 21:57:24 +0200 Subject: [PATCH] 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 --- requirements.txt | 4 ++-- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index b51ddca..8aa4351 100644 --- 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 --- 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', -- 2.25.1