From 9a4b8b23484e767a8708ca529a0f9df4d0beaa36 Mon Sep 17 00:00:00 2001 From: tierno Date: Thu, 2 Jul 2020 07:35:25 +0000 Subject: [PATCH] change dependencies to use branch v8.0 Change-Id: I94e1ef61fae5ca489b5f733121078db5d845724b Signed-off-by: tierno --- Dockerfile.local | 3 +++ osm_nbi/__init__.py | 4 ++-- requirements.txt | 4 ++-- setup.py | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Dockerfile.local b/Dockerfile.local index 2d76bfd..075c496 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -28,6 +28,7 @@ RUN apt-get update && apt-get install -y git python3 \ # OSM_COMMON RUN git -C /app clone https://osm.etsi.org/gerrit/osm/common.git \ + && git -C /app/common checkout v8.0 \ && python3 -m pip install -e /app/common # && cd common && python3 setup.py develop && cd .. # && pip3 install -U -r requirements.txt \ @@ -35,7 +36,9 @@ RUN git -C /app clone https://osm.etsi.org/gerrit/osm/common.git \ # OSM_IM RUN git -C /app clone https://osm.etsi.org/gerrit/osm/IM \ + && git -C /app/IM checkout v8.0 \ && python3 -m pip install /app/IM + # ^ option -e does not work for IM EXPOSE 9999 diff --git a/osm_nbi/__init__.py b/osm_nbi/__init__.py index 7bd5b6b..963296f 100644 --- a/osm_nbi/__init__.py +++ b/osm_nbi/__init__.py @@ -12,8 +12,8 @@ # under the License. ## -version = '7.0.1.post23' -version_date = '2020-04-17' +version = '8.0.0.post1' +version_date = '2020-07-01' # Obtain installed package version. Ignore if error, e.g. pkg_resources not installed try: diff --git a/requirements.txt b/requirements.txt index 1f2adf9..f0a2cc2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,6 +15,6 @@ 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@v8.0#egg=osm-common +git+https://osm.etsi.org/gerrit/osm/IM.git@v8.0#egg=osm-im aiohttp>=2.3.10 diff --git a/setup.py b/setup.py index f134876..f9a2197 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 @ git+https://osm.etsi.org/gerrit/osm/common.git@v8.0#egg=osm-common', 'jsonschema==3.2.0', 'PyYAML', - 'osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im', + 'osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git@v8.0#egg=osm-im', 'python-keystoneclient', 'requests', 'aiohttp>=2.3.10', -- 2.25.1