Skip to content

Commit

Permalink
Conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
lumburovskalina committed Oct 16, 2024
1 parent ab49a13 commit 41f1ef7
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 27 deletions.
53 changes: 29 additions & 24 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# pip-compile --output-file=requirements.txt --strip-extras requirements/requirements.in
#
aiohappyeyeballs==2.4.0
aiohappyeyeballs==2.4.3
# via
# -r requirements/exec-env-requirements.txt
# aiohttp
aiohttp==3.10.5
aiohttp==3.10.10
# via
# -r requirements/exec-env-requirements.txt
# openai
Expand All @@ -18,7 +18,7 @@ aiosignal==1.3.1
# aiohttp
annotated-types==0.7.0
# via pydantic
anyio==4.4.0
anyio==4.6.2.post1
# via
# -r requirements/exec-env-requirements.txt
# groq
Expand Down Expand Up @@ -64,7 +64,7 @@ chardet==5.2.0
# via
# -r requirements/exec-env-requirements.txt
# breadability
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via
# -r requirements/exec-env-requirements.txt
# requests
Expand All @@ -91,7 +91,7 @@ cymem==2.0.8
# preshed
# spacy
# thinc
cytoolz==0.12.3
cytoolz==1.0.0
# via
# -r requirements/exec-env-requirements.txt
# textacy
Expand Down Expand Up @@ -136,26 +136,26 @@ hijri-converter==2.3.1
# holidays
holidays==0.21.13
# via -r requirements/exec-env-requirements.txt
httpcore==1.0.5
httpcore==1.0.6
# via
# -r requirements/exec-env-requirements.txt
# httpx
httpx==0.27.2
# via
# -r requirements/exec-env-requirements.txt
# groq
idna==3.8
idna==3.10
# via
# -r requirements/exec-env-requirements.txt
# anyio
# httpx
# requests
# yarl
importlib-metadata==8.4.0
importlib-metadata==8.5.0
# via
# -r requirements/exec-env-requirements.txt
# typeguard
inflect==7.3.1
inflect==7.4.0
# via
# -r requirements/exec-env-requirements.txt
# quantulum3
Expand All @@ -180,7 +180,7 @@ korean-lunar-calendar==0.3.1
# via
# -r requirements/exec-env-requirements.txt
# holidays
langcodes==3.4.0
langcodes==3.4.1
# via
# -r requirements/exec-env-requirements.txt
# spacy
Expand All @@ -205,19 +205,19 @@ lxml==5.3.0
# -r requirements/exec-env-requirements.txt
# breadability
# translate
marisa-trie==1.2.0
marisa-trie==1.2.1
# via
# -r requirements/exec-env-requirements.txt
# language-data
markupsafe==2.1.5
markupsafe==3.0.1
# via
# -r requirements/exec-env-requirements.txt
# jinja2
more-itertools==10.4.0
more-itertools==10.5.0
# via
# -r requirements/exec-env-requirements.txt
# inflect
multidict==6.0.5
multidict==6.1.0
# via
# -r requirements/exec-env-requirements.txt
# aiohttp
Expand Down Expand Up @@ -262,7 +262,7 @@ packaging==24.1
# spacy
# thinc
# weasel
pandas==2.2.2
pandas==2.2.3
# via
# -r requirements/exec-env-requirements.txt
# lexmo
Expand All @@ -279,7 +279,11 @@ preshed==3.0.9
# -r requirements/exec-env-requirements.txt
# spacy
# thinc
pyaml==24.7.0
propcache==0.2.0
# via
# -r requirements/exec-env-requirements.txt
# yarl
pyaml==24.9.0
# via
# -r requirements/exec-env-requirements.txt
# scikit-optimize
Expand Down Expand Up @@ -314,7 +318,7 @@ python-dateutil==2.9.0.post0
# pandas
python-levenshtein==0.20.8
# via -r requirements/exec-env-requirements.txt
pytz==2024.1
pytz==2024.2
# via
# -r requirements/exec-env-requirements.txt
# pandas
Expand All @@ -328,7 +332,7 @@ rapidfuzz==2.15.2
# via
# -r requirements/exec-env-requirements.txt
# levenshtein
regex==2024.7.24
regex==2024.9.11
# via
# -r requirements/exec-env-requirements.txt
# nltk
Expand Down Expand Up @@ -391,7 +395,7 @@ spacy-loggers==1.0.5
# via
# -r requirements/exec-env-requirements.txt
# spacy
sqlalchemy==2.0.33
sqlalchemy==2.0.36
# via
# -r requirements/exec-env-requirements.txt
# knowledge
Expand Down Expand Up @@ -431,7 +435,7 @@ threadpoolctl==3.5.0
# scikit-learn
tiktoken==0.4.0
# via -r requirements/exec-env-requirements.txt
toolz==0.12.1
toolz==1.0.0
# via
# -r requirements/exec-env-requirements.txt
# cytoolz
Expand Down Expand Up @@ -460,15 +464,16 @@ typing-extensions==4.12.2
# anyio
# cloudpathlib
# groq
# multidict
# pydantic
# pydantic-core
# sqlalchemy
# typeguard
tzdata==2024.1
tzdata==2024.2
# via
# -r requirements/exec-env-requirements.txt
# pandas
urllib3==2.2.2
urllib3==2.2.3
# via
# -r requirements/exec-env-requirements.txt
# requests
Expand All @@ -482,11 +487,11 @@ wasabi==0.10.1
# weasel
weasel==0.4.1
# via spacy
yarl==1.9.8
yarl==1.15.3
# via
# -r requirements/exec-env-requirements.txt
# aiohttp
zipp==3.20.1
zipp==3.20.2
# via
# -r requirements/exec-env-requirements.txt
# importlib-metadata
Expand Down
6 changes: 3 additions & 3 deletions requirements/exec-env-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ pyaml==24.9.0
# via scikit-optimize
pycountry==24.6.1
# via sumy
pydantic==1.10.18
# pydantic==1.10.18
# via
# confection
# groq
Expand Down Expand Up @@ -264,7 +264,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
Expand Down Expand Up @@ -295,7 +295,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
Expand Down

0 comments on commit 41f1ef7

Please sign in to comment.