From 09f07f3fab87a34680b51a5a1fbe09f246bdf0ba Mon Sep 17 00:00:00 2001 From: tierno Date: Fri, 4 Sep 2020 14:07:15 +0000 Subject: [PATCH] fixing version for grpcio dependency Change-Id: Ideb5e40eb621eedcb7a4a8a2b32224efdecbffd9 Signed-off-by: tierno --- Dockerfile.local | 2 +- requirements.txt | 4 ++-- setup.py | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile.local b/Dockerfile.local index 03afbd1..c1eddae 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -51,7 +51,7 @@ RUN git -C /app clone https://osm.etsi.org/gerrit/osm/common.git \ && python3 -m pip install -e /app/common # python3-pymongo python3-yaml pycrypto aiokafka -RUN python3 -m pip install grpcio-tools grpclib +RUN python3 -m pip install grpcio==1.31.0 grpcio-tools==1.31.0 grpclib==0.3.2 RUN mkdir -p /app/storage/kafka && mkdir -p /app/log diff --git a/requirements.txt b/requirements.txt index ce15d2d..4606699 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,8 +15,8 @@ pyyaml aiohttp>=2.3.10 jinja2 -grpcio-tools -grpclib +grpcio-tools==1.31.0 +grpclib==0.3.2 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 720e72f..353dc00 100644 --- a/setup.py +++ b/setup.py @@ -52,10 +52,8 @@ setup( 'osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@v8.0#egg=osm-common', 'n2vc @ git+https://osm.etsi.org/gerrit/osm/N2VC.git@v8.0#egg=n2vc', 'jinja2', - 'grpcio-tools', - 'grpclib', - # TODO this is version installed by 'apt python3-aiohttp' on Ubuntu Sserver 14.04 - # version installed by pip 3.3.2 is not compatible. Code should be migrated to this version and use pip3 + 'grpcio-tools==1.31.0', + 'grpclib==0.3.2', ], setup_requires=['setuptools-version-command'], ) -- 2.25.1