From 2302c4257a2bd3fdcc529600f67f89bc89d98671 Mon Sep 17 00:00:00 2001 From: Siarhei Khaletski Date: Wed, 29 Sep 2021 15:00:18 +0300 Subject: [PATCH 1/4] Updated wellbore-gcp-lib version with support gce metadata --- requirements.in | 2 +- requirements.txt | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/requirements.in b/requirements.in index 6b7fcbc6..c31e47b3 100644 --- a/requirements.in +++ b/requirements.in @@ -33,7 +33,7 @@ osdu-data-ecosystem-storage~=1.2.0 osdu-data-ecosystem-search>=0.3.2, <0.4 osdu-core-lib-python-ibm~=1.2.0 -osdu-core-lib-python-gcp~=1.1.0 +osdu-core-lib-python-gcp==1.1.0.dev621326 osdu-core-lib-python-azure~=1.2.1 osdu-core-lib-python-aws>=0.0.1, <0.1 osdu-core-lib-python~=1.1.0 diff --git a/requirements.txt b/requirements.txt index 3f7f9b2e..69562f08 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with python 3.7 # To update, run: # -# pip-compile requirements.in +# pip-compile # --extra-index-url https://community.opengroup.org/api/v4/projects/465/packages/pypi/simple/ @@ -97,8 +97,6 @@ cloudpickle==1.6.0 # via # dask # distributed -colorama==0.4.4 - # via click cryptography==3.4.7 # via # -r requirements.in @@ -181,6 +179,8 @@ idna==3.2 # requests # rfc3986 # yarl +importlib-metadata==4.8.1 + # via click isodate==0.6.0 # via msrest jmespath==0.10.0 @@ -244,7 +244,7 @@ osdu-core-lib-python-aws==0.0.2 # via -r requirements.in osdu-core-lib-python-azure==1.2.1 # via -r requirements.in -osdu-core-lib-python-gcp==1.1.0 +osdu-core-lib-python-gcp==1.1.0.dev621326 # via -r requirements.in osdu-core-lib-python-ibm==1.2.0 # via -r requirements.in @@ -312,8 +312,6 @@ pytz==2021.1 # via # google-api-core # pandas - #pywin32==301 - # via portalocker pyyaml==5.4.1 # via # dask @@ -376,9 +374,15 @@ tornado==6.1 typing-extensions==3.10.0.0 # via # aiohttp + # anyio + # asgiref + # importlib-metadata # osdu-data-ecosystem-search # osdu-data-ecosystem-storage # pydantic + # structlog + # uvicorn + # yarl urllib3==1.26.6 # via # botocore @@ -391,6 +395,8 @@ yarl==1.6.3 # via aiohttp zict==2.0.0 # via distributed +zipp==3.5.1 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools -- GitLab From d56002e724d3e375cc33c3e7a37c46152a322543 Mon Sep 17 00:00:00 2001 From: "Aliaksandr Ramanovich (EPAM)" Date: Thu, 30 Sep 2021 13:00:21 +0000 Subject: [PATCH 2/4] Update values.yaml --- devops/gcp/deploy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/gcp/deploy/values.yaml b/devops/gcp/deploy/values.yaml index 0ba4b5cd..bf3e81fa 100644 --- a/devops/gcp/deploy/values.yaml +++ b/devops/gcp/deploy/values.yaml @@ -6,7 +6,7 @@ data: requests_cpu: "0.25" requests_memory: "256M" limits_cpu: "1" - limits_memory: "1G" + limits_memory: "2G" image: "community.opengroup.org:5555/osdu/platform/domain-data-mgmt-services/wellbore/wellbore-domain-services/osdu-gcp:latest" conf: -- GitLab From 592dc0dfc8dcffd2a31a6bd823227d02c1a9c6ca Mon Sep 17 00:00:00 2001 From: Siarhei Khaletski Date: Fri, 1 Oct 2021 14:03:48 +0300 Subject: [PATCH 3/4] removed lru_cache --- app/utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/utils.py b/app/utils.py index 45d9a3f4..312a5b9e 100644 --- a/app/utils.py +++ b/app/utils.py @@ -38,7 +38,6 @@ from logging import INFO POOL_EXECUTOR_MAX_WORKER = 4 -@lru_cache() def get_http_client_session(key: str = 'GLOBAL'): return ClientSession(json_serialize=json.dumps) -- GitLab From 77cf289c7c4861ca1fa0ad5046cf9fff65382a09 Mon Sep 17 00:00:00 2001 From: Siarhei Khaletski Date: Fri, 1 Oct 2021 15:42:44 +0300 Subject: [PATCH 4/4] changed versions --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index c31e47b3..7cac865b 100644 --- a/requirements.in +++ b/requirements.in @@ -33,7 +33,7 @@ osdu-data-ecosystem-storage~=1.2.0 osdu-data-ecosystem-search>=0.3.2, <0.4 osdu-core-lib-python-ibm~=1.2.0 -osdu-core-lib-python-gcp==1.1.0.dev621326 +osdu-core-lib-python-gcp==1.1.0.dev628687 osdu-core-lib-python-azure~=1.2.1 osdu-core-lib-python-aws>=0.0.1, <0.1 osdu-core-lib-python~=1.1.0 diff --git a/requirements.txt b/requirements.txt index 69562f08..16a6d939 100644 --- a/requirements.txt +++ b/requirements.txt @@ -244,7 +244,7 @@ osdu-core-lib-python-aws==0.0.2 # via -r requirements.in osdu-core-lib-python-azure==1.2.1 # via -r requirements.in -osdu-core-lib-python-gcp==1.1.0.dev621326 +osdu-core-lib-python-gcp==1.1.0.dev628687 # via -r requirements.in osdu-core-lib-python-ibm==1.2.0 # via -r requirements.in -- GitLab