From 3555d1e23f62b18e6fa60e21259f6b03d4ee60f5 Mon Sep 17 00:00:00 2001 From: Lina Date: Wed, 27 Nov 2024 13:13:41 +0100 Subject: [PATCH 1/2] new parent image --- Dockerfile | 2 +- requirements/exec-env-requirements.txt | 44 ++++++++++++++------------ 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index 29405cd..3f37090 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM kernai/refinery-parent-images:v1.19.0-exec-env +FROM kernai/refinery-parent-images:v1.20.0-exec-env COPY requirements.txt . diff --git a/requirements/exec-env-requirements.txt b/requirements/exec-env-requirements.txt index 5d756ae..9cfd2c1 100644 --- a/requirements/exec-env-requirements.txt +++ b/requirements/exec-env-requirements.txt @@ -6,7 +6,7 @@ # aiohappyeyeballs==2.4.3 # via aiohttp -aiohttp==3.10.10 +aiohttp==3.11.7 # via openai aiosignal==1.3.1 # via aiohttp @@ -14,7 +14,7 @@ anyio==4.6.2.post1 # via # groq # httpx -async-timeout==4.0.3 +async-timeout==5.0.1 # via aiohttp attrs==24.2.0 # via aiohttp @@ -52,7 +52,7 @@ confection==0.1.5 # via thinc convertdate==2.4.0 # via holidays -cymem==2.0.8 +cymem==2.0.10 # via # preshed # spacy @@ -72,7 +72,7 @@ flashtext==2.7 # via -r exec-env-requirements.in floret==0.10.5 # via textacy -frozenlist==1.4.1 +frozenlist==1.5.0 # via # aiohttp # aiosignal @@ -88,7 +88,7 @@ hijri-converter==2.3.1 # via holidays holidays==0.21.13 # via -r exec-env-requirements.in -httpcore==1.0.6 +httpcore==1.0.7 # via httpx httpx==0.27.2 # via groq @@ -118,11 +118,11 @@ knowledge==0.3 # via -r exec-env-requirements.in korean-lunar-calendar==0.3.1 # via holidays -langcodes==3.4.1 +langcodes==3.5.0 # via spacy langdetect==1.0.9 # via -r exec-env-requirements.in -language-data==1.2.0 +language-data==1.3.0 # via langcodes levenshtein==0.20.8 # via python-levenshtein @@ -136,7 +136,7 @@ lxml==5.3.0 # translate marisa-trie==1.2.1 # via language-data -markupsafe==3.0.1 +markupsafe==3.0.2 # via jinja2 more-itertools==10.5.0 # via inflect @@ -144,7 +144,7 @@ multidict==6.1.0 # via # aiohttp # yarl -murmurhash==1.0.10 +murmurhash==1.0.11 # via # preshed # spacy @@ -173,7 +173,7 @@ numpy==1.23.4 # thinc openai==0.27.7 # via -r exec-env-requirements.in -packaging==24.1 +packaging==24.2 # via # spacy # thinc @@ -190,12 +190,14 @@ preshed==3.0.9 # spacy # thinc propcache==0.2.0 - # via yarl + # via + # aiohttp + # yarl pyaml==24.9.0 # via scikit-optimize pycountry==24.6.1 # via sumy -#pydantic==1.10.18 +pydantic==1.10.19 # via # confection # groq @@ -205,7 +207,7 @@ pymeeus==0.5.12 # via # convertdate # holidays -pyphen==0.16.0 +pyphen==0.17.0 # via # textacy # textstat @@ -223,7 +225,7 @@ quantulum3==0.7.11 # via -r exec-env-requirements.in rapidfuzz==2.15.2 # via levenshtein -regex==2024.9.11 +regex==2024.11.6 # via # nltk # tiktoken @@ -264,7 +266,7 @@ sniffio==1.3.1 # httpx soupsieve==2.6 # via beautifulsoup4 -# spacy[ja]==3.4.2 +spacy[ja]==3.4.2 # via # -r exec-env-requirements.in # textacy @@ -281,7 +283,7 @@ srsly==2.4.8 # thinc stemming==1.0.1 # via -r exec-env-requirements.in -sudachidict-core==20240716 +sudachidict-core==20241021 # via spacy sudachipy==0.6.8 # via @@ -295,7 +297,7 @@ textblob==0.17.1 # via -r exec-env-requirements.in textstat==0.7.3 # via -r exec-env-requirements.in -thinc==8.2.5 +thinc==8.1.12 # via spacy threadpoolctl==3.5.0 # via scikit-learn @@ -303,7 +305,7 @@ tiktoken==0.4.0 # via -r exec-env-requirements.in toolz==1.0.0 # via cytoolz -tqdm==4.66.5 +tqdm==4.67.1 # via # nltk # openai @@ -311,7 +313,7 @@ tqdm==4.66.5 # textacy translate==3.6.1 # via -r exec-env-requirements.in -typeguard==4.3.0 +typeguard==4.4.1 # via inflect typer==0.4.2 # via @@ -335,9 +337,9 @@ wasabi==0.10.1 # via # spacy # thinc -yarl==1.15.3 +yarl==1.18.0 # via aiohttp -zipp==3.20.2 +zipp==3.21.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: From 9df667e38cc2fdafadd7fe3d747b29e2153c602e Mon Sep 17 00:00:00 2001 From: Lina Date: Wed, 27 Nov 2024 13:23:40 +0100 Subject: [PATCH 2/2] conflict fix --- requirements.txt | 35 +++++++++++++------------- requirements/exec-env-requirements.txt | 6 ++--- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/requirements.txt b/requirements.txt index bbe84e7..c0f7a66 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ aiohappyeyeballs==2.4.3 # via # -r requirements/exec-env-requirements.txt # aiohttp -aiohttp==3.10.10 +aiohttp==3.11.7 # via # -r requirements/exec-env-requirements.txt # openai @@ -23,7 +23,7 @@ anyio==4.6.2.post1 # -r requirements/exec-env-requirements.txt # groq # httpx -async-timeout==4.0.3 +async-timeout==5.0.1 # via # -r requirements/exec-env-requirements.txt # aiohttp @@ -85,7 +85,7 @@ convertdate==2.4.0 # via # -r requirements/exec-env-requirements.txt # holidays -cymem==2.0.8 +cymem==2.0.10 # via # -r requirements/exec-env-requirements.txt # preshed @@ -115,7 +115,7 @@ floret==0.10.5 # via # -r requirements/exec-env-requirements.txt # textacy -frozenlist==1.4.1 +frozenlist==1.5.0 # via # -r requirements/exec-env-requirements.txt # aiohttp @@ -136,7 +136,7 @@ hijri-converter==2.3.1 # holidays holidays==0.21.13 # via -r requirements/exec-env-requirements.txt -httpcore==1.0.6 +httpcore==1.0.7 # via # -r requirements/exec-env-requirements.txt # httpx @@ -180,13 +180,13 @@ korean-lunar-calendar==0.3.1 # via # -r requirements/exec-env-requirements.txt # holidays -langcodes==3.4.1 +langcodes==3.5.0 # via # -r requirements/exec-env-requirements.txt # spacy langdetect==1.0.9 # via -r requirements/exec-env-requirements.txt -language-data==1.2.0 +language-data==1.3.0 # via # -r requirements/exec-env-requirements.txt # langcodes @@ -209,7 +209,7 @@ marisa-trie==1.2.1 # via # -r requirements/exec-env-requirements.txt # language-data -markupsafe==3.0.1 +markupsafe==3.0.2 # via # -r requirements/exec-env-requirements.txt # jinja2 @@ -222,7 +222,7 @@ multidict==6.1.0 # -r requirements/exec-env-requirements.txt # aiohttp # yarl -murmurhash==1.0.10 +murmurhash==1.0.11 # via # -r requirements/exec-env-requirements.txt # preshed @@ -256,7 +256,7 @@ numpy==1.23.4 # thinc openai==0.27.7 # via -r requirements/exec-env-requirements.txt -packaging==24.1 +packaging==24.2 # via # -r requirements/exec-env-requirements.txt # spacy @@ -282,6 +282,7 @@ preshed==3.0.9 propcache==0.2.0 # via # -r requirements/exec-env-requirements.txt + # aiohttp # yarl pyaml==24.9.0 # via @@ -306,7 +307,7 @@ pymeeus==0.5.12 # -r requirements/exec-env-requirements.txt # convertdate # holidays -pyphen==0.16.0 +pyphen==0.17.0 # via # -r requirements/exec-env-requirements.txt # textacy @@ -332,7 +333,7 @@ rapidfuzz==2.15.2 # via # -r requirements/exec-env-requirements.txt # levenshtein -regex==2024.9.11 +regex==2024.11.6 # via # -r requirements/exec-env-requirements.txt # nltk @@ -408,7 +409,7 @@ srsly==2.4.8 # weasel stemming==1.0.1 # via -r requirements/exec-env-requirements.txt -sudachidict-core==20240716 +sudachidict-core==20241021 # via # -r requirements/exec-env-requirements.txt # spacy @@ -439,7 +440,7 @@ toolz==1.0.0 # via # -r requirements/exec-env-requirements.txt # cytoolz -tqdm==4.66.5 +tqdm==4.67.1 # via # -r requirements/exec-env-requirements.txt # nltk @@ -448,7 +449,7 @@ tqdm==4.66.5 # textacy translate==3.6.1 # via -r requirements/exec-env-requirements.txt -typeguard==4.3.0 +typeguard==4.4.1 # via # -r requirements/exec-env-requirements.txt # inflect @@ -487,11 +488,11 @@ wasabi==0.10.1 # weasel weasel==0.4.1 # via spacy -yarl==1.15.3 +yarl==1.18.0 # via # -r requirements/exec-env-requirements.txt # aiohttp -zipp==3.20.2 +zipp==3.21.0 # via # -r requirements/exec-env-requirements.txt # importlib-metadata diff --git a/requirements/exec-env-requirements.txt b/requirements/exec-env-requirements.txt index 9cfd2c1..363df38 100644 --- a/requirements/exec-env-requirements.txt +++ b/requirements/exec-env-requirements.txt @@ -197,7 +197,7 @@ pyaml==24.9.0 # via scikit-optimize pycountry==24.6.1 # via sumy -pydantic==1.10.19 +# pydantic==1.10.19 # via # confection # groq @@ -266,7 +266,7 @@ sniffio==1.3.1 # httpx soupsieve==2.6 # via beautifulsoup4 -spacy[ja]==3.4.2 +# spacy[ja]==3.4.2 # via # -r exec-env-requirements.in # textacy @@ -297,7 +297,7 @@ textblob==0.17.1 # via -r exec-env-requirements.in textstat==0.7.3 # via -r exec-env-requirements.in -thinc==8.1.12 +thinc==8.2.5 # via spacy threadpoolctl==3.5.0 # via scikit-learn