From eec4b42ddd963e0154ecd01df94cd0cad7efed62 Mon Sep 17 00:00:00 2001 From: lumburovskalina <104008550+lumburovskalina@users.noreply.github.com> Date: Thu, 29 Aug 2024 10:59:15 +0200 Subject: [PATCH] new parent image (#70) --- Dockerfile | 2 +- dev.Dockerfile | 2 +- requirements.txt | 29 ++++++++++++++-------------- requirements/common-requirements.txt | 17 ++++++++++------ submodules/model | 2 +- 5 files changed, 29 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index b12e90c..bb83cc6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM kernai/refinery-parent-images:v1.17.2-common +FROM kernai/refinery-parent-images:v1.18.1-common WORKDIR /program diff --git a/dev.Dockerfile b/dev.Dockerfile index 503f50a..537a4d8 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM kernai/refinery-parent-images:v1.17.2-common +FROM kernai/refinery-parent-images:v1.18.1-common WORKDIR /app diff --git a/requirements.txt b/requirements.txt index a1e1f5c..922d368 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,10 +2,12 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --output-file=requirements.txt --strip-extras requirements/requirements.in +# pip-compile --output-file=requirements.txt requirements/requirements.in # annotated-types==0.7.0 - # via pydantic + # via + # -r requirements/common-requirements.txt + # pydantic anyio==4.4.0 # via # -r requirements/common-requirements.txt @@ -24,7 +26,7 @@ catalogue==2.0.10 # spacy # srsly # thinc -certifi==2024.6.2 +certifi==2024.7.4 # via # -r requirements/common-requirements.txt # minio @@ -49,19 +51,17 @@ cymem==2.0.8 # preshed # spacy # thinc -exceptiongroup==1.2.1 +exceptiongroup==1.2.2 # via # -r requirements/common-requirements.txt # anyio fastapi==0.110.3 # via -r requirements/common-requirements.txt -greenlet==3.0.3 - # via sqlalchemy h11==0.14.0 # via # -r requirements/common-requirements.txt # uvicorn -idna==3.7 +idna==3.8 # via # -r requirements/common-requirements.txt # anyio @@ -114,6 +114,7 @@ psycopg2-binary==2.9.9 # via -r requirements/common-requirements.txt pydantic==2.7.4 # via + # -r requirements/common-requirements.txt # -r requirements/requirements.in # confection # fastapi @@ -121,7 +122,9 @@ pydantic==2.7.4 # thinc # weasel pydantic-core==2.18.4 - # via pydantic + # via + # -r requirements/common-requirements.txt + # pydantic pygments==2.18.0 # via rich python-dateutil==2.9.0.post0 @@ -156,10 +159,8 @@ sniffio==1.3.1 # via # -r requirements/common-requirements.txt # anyio -spacy==3.7.5 - # via - # -r requirements/requirements.in - # spacy +spacy[ja]==3.7.5 + # via -r requirements/requirements.in spacy-legacy==3.0.12 # via spacy spacy-loggers==1.0.5 @@ -190,7 +191,7 @@ typer==0.12.3 # via # spacy # weasel -typing-extensions==4.12.1 +typing-extensions==4.12.2 # via # -r requirements/common-requirements.txt # anyio @@ -200,7 +201,7 @@ typing-extensions==4.12.1 # pydantic-core # starlette # typer -urllib3==1.26.18 +urllib3==1.26.19 # via # -r requirements/common-requirements.txt # botocore diff --git a/requirements/common-requirements.txt b/requirements/common-requirements.txt index 258254a..cf721ef 100644 --- a/requirements/common-requirements.txt +++ b/requirements/common-requirements.txt @@ -4,6 +4,8 @@ # # pip-compile common-requirements.in # +annotated-types==0.7.0 + # via pydantic anyio==4.4.0 # via starlette boto3==1.25.0 @@ -12,7 +14,7 @@ botocore==1.28.5 # via # boto3 # s3transfer -certifi==2024.6.2 +certifi==2024.7.4 # via # minio # requests @@ -20,13 +22,13 @@ charset-normalizer==3.3.2 # via requests click==8.1.7 # via uvicorn -exceptiongroup==1.2.1 +exceptiongroup==1.2.2 # via anyio fastapi==0.110.3 # via -r mini-requirements.in h11==0.14.0 # via uvicorn -idna==3.7 +idna==3.8 # via # anyio # requests @@ -44,10 +46,12 @@ pandas==1.5.1 # via -r common-requirements.in psycopg2-binary==2.9.9 # via -r common-requirements.in -# pydantic==1.10.13 +pydantic==2.7.4 # via # -r mini-requirements.in # fastapi +pydantic-core==2.18.4 + # via pydantic python-dateutil==2.9.0.post0 # via # botocore @@ -66,13 +70,14 @@ sqlalchemy==1.4.42 # via -r common-requirements.in starlette==0.37.2 # via fastapi -typing-extensions==4.12.1 +typing-extensions==4.12.2 # via # anyio # fastapi # pydantic + # pydantic-core # starlette -urllib3==1.26.18 +urllib3==1.26.19 # via # botocore # minio diff --git a/submodules/model b/submodules/model index 6a0b51a..bc83877 160000 --- a/submodules/model +++ b/submodules/model @@ -1 +1 @@ -Subproject commit 6a0b51a5e7cf88d58cb258a6c9014c4644626faa +Subproject commit bc83877d7b51ec44d1307f0b424bb3d144d751f5