From 1b11780f5217ae9ad4e24448c924cee76c30e405 Mon Sep 17 00:00:00 2001 From: tierno Date: Thu, 2 Jul 2020 13:48:54 +0000 Subject: [PATCH] change dependencies to v8.0 branch Change-Id: I320c6da8ce42e042ae8e4d2d47c6c4d4dd8e9590 Signed-off-by: tierno --- Dockerfile.local | 2 ++ osm_lcm/__init__.py | 4 ++-- requirements.txt | 4 ++-- setup.py | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile.local b/Dockerfile.local index d02aee2..cdfd877 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -39,6 +39,7 @@ RUN apt-get update && apt-get install -y git tox python3 \ && python3 -m pip install -U 'PyYAML' 'aiohttp>=2.3.10' flake8 RUN git -C /app clone https://osm.etsi.org/gerrit/osm/N2VC.git \ + && git -C /app/N2VC checkout v8.0 \ && python3 -m pip install -e /app/N2VC \ && python3 -m pip install -U juju \ && apt-get install -y libffi-dev libssl-dev openssh-client @@ -46,6 +47,7 @@ RUN git -C /app clone https://osm.etsi.org/gerrit/osm/N2VC.git \ # cd modules/libjuju; python3 setup.py develop 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 # python3-pymongo python3-yaml pycrypto aiokafka diff --git a/osm_lcm/__init__.py b/osm_lcm/__init__.py index d013101..4410388 100644 --- a/osm_lcm/__init__.py +++ b/osm_lcm/__init__.py @@ -13,8 +13,8 @@ ## # version moved to lcm.py. uncomment if LCM is installed as library and installed -version = '7.0.1.post18' -version_date = '2020-04-08' +version = '8.0.0.post1' +version_date = '2020-07-01' # Try to get version from package using pkg_resources (available with setuptools) try: diff --git a/requirements.txt b/requirements.txt index 32a09a9..ce15d2d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,6 +17,6 @@ aiohttp>=2.3.10 jinja2 grpcio-tools grpclib -git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common -git+https://osm.etsi.org/gerrit/osm/N2VC.git#egg=n2vc +git+https://osm.etsi.org/gerrit/osm/common.git@v8.0#egg=osm-common +git+https://osm.etsi.org/gerrit/osm/N2VC.git@v8.0#egg=n2vc diff --git a/setup.py b/setup.py index aa83fd6..68b6c64 100644 --- a/setup.py +++ b/setup.py @@ -46,8 +46,8 @@ setup( # ('/etc/systemd/system/', ['osm_lcm/osm-lcm.service']), # ], dependency_links=[ - 'git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common', - 'git+https://osm.etsi.org/gerrit/osm/N2VC.git#egg=n2vc', + 'git+https://osm.etsi.org/gerrit/osm/common.git@v8.0#egg=osm-common', + 'git+https://osm.etsi.org/gerrit/osm/N2VC.git@v8.0#egg=n2vc', ], install_requires=[ # 'pymongo', -- 2.17.1