Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update importlib-metadata pin #3491

Merged
merged 1 commit into from
Aug 7, 2024
Merged

chore: update importlib-metadata pin #3491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions requirements/deps/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,3 @@ fsspec==2024.5.0
wrapt>=1.14.0

langchain-community>=0.2.5

# NOTE(robinson): choma was pinned to importlib-metadata>=7.1.0 but 7.1.0 was installed
# instead of 7.2.0. Need to investigate
importlib-metadata==7.1.0
Copy link
Collaborator Author

@Coniferish Coniferish Aug 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed this pin

3 changes: 1 addition & 2 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,8 @@ idna==3.7
# httpx
# jsonschema
# requests
importlib-metadata==7.1.0
importlib-metadata==8.2.0
# via
# -c ././deps/constraints.txt
# build
# jupyter-client
# jupyter-lsp
Expand Down
6 changes: 2 additions & 4 deletions requirements/extra-markdown.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
#
# pip-compile ./extra-markdown.in
#
importlib-metadata==7.1.0
# via
# -c ././deps/constraints.txt
# markdown
importlib-metadata==8.2.0
# via markdown
markdown==3.6
# via -r ./extra-markdown.in
zipp==3.19.2
Expand Down
2 changes: 1 addition & 1 deletion requirements/extra-paddleocr.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ matplotlib==3.7.2
# via
# -c ././deps/constraints.txt
# imgaug
more-itertools==10.3.0
more-itertools==10.4.0
# via cssutils
networkx==3.2.1
# via scikit-image
Expand Down
2 changes: 1 addition & 1 deletion requirements/extra-pdf-image.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ fsspec==2024.5.0
# torch
google-api-core[grpc]==2.19.1
# via google-cloud-vision
google-auth==2.32.0
google-auth==2.33.0
# via
# google-api-core
# google-cloud-vision
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/azure.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
adlfs==2024.7.0
# via -r ./ingest/azure.in
aiohappyeyeballs==2.3.4
aiohappyeyeballs==2.3.5
# via aiohttp
aiohttp==3.10.1
# via adlfs
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/chroma.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-c ../deps/constraints.txt
-c ../base.txt
chromadb
importlib-metadata>=7.1.0
importlib-metadata>=8.2.0
Copy link
Collaborator Author

@Coniferish Coniferish Aug 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added this pin.
opentelemetry-api has importlib-metadata pinned here to "importlib-metadata >= 6.0, <= 8.2.0",

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other extras were resolving to 8.2.0, but chroma was resolving to 8.0.0 for some reason. Pinned 8.2.0 as a minimum version to force the chroma dependency to match the others.

# Future releases adds in typer-cli which breaks the resolution of typer as a library
typer<=0.9.0
# tenacity 9.0.0 is being installed via chroma, but other dependencies (langchain) restrict tenacity
Expand Down
85 changes: 19 additions & 66 deletions requirements/ingest/chroma.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,30 @@ anyio==3.7.1
# httpx
# starlette
# watchfiles
asgiref==3.8.1
# via opentelemetry-instrumentation-asgi
backoff==2.2.1
# via
# -c ./ingest/../base.txt
# opentelemetry-exporter-otlp-proto-grpc
# posthog
bcrypt==4.2.0
# via chromadb
build==1.2.1
# via chromadb
cachetools==5.4.0
# via google-auth
certifi==2024.7.4
# via
# -c ./ingest/../base.txt
# -c ./ingest/../deps/constraints.txt
# httpcore
# httpx
# kubernetes
# pulsar-client
# requests
charset-normalizer==3.3.2
# via
# -c ./ingest/../base.txt
# requests
chroma-hnswlib==0.7.6
chroma-hnswlib==0.7.3
# via chromadb
chromadb==0.5.5
chromadb==0.4.17
# via -r ./ingest/chroma.in
click==8.1.7
# via
Expand All @@ -49,10 +46,7 @@ click==8.1.7
coloredlogs==15.0.1
# via onnxruntime
deprecated==1.2.14
# via
# opentelemetry-api
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-semantic-conventions
# via opentelemetry-api
exceptiongroup==1.2.2
# via
# -c ./ingest/../base.txt
Expand All @@ -67,7 +61,7 @@ fsspec==2024.5.0
# via
# -c ./ingest/../deps/constraints.txt
# huggingface-hub
google-auth==2.32.0
google-auth==2.33.0
# via kubernetes
googleapis-common-protos==1.63.2
# via opentelemetry-exporter-otlp-proto-grpc
Expand All @@ -80,16 +74,8 @@ h11==0.14.0
# -c ./ingest/../base.txt
# httpcore
# uvicorn
httpcore==1.0.5
# via
# -c ./ingest/../base.txt
# httpx
httptools==0.6.1
# via uvicorn
httpx==0.27.0
# via
# -c ./ingest/../base.txt
# chromadb
huggingface-hub==0.24.5
# via tokenizers
humanfriendly==10.0
Expand All @@ -100,18 +86,12 @@ idna==3.7
# anyio
# httpx
# requests
importlib-metadata==7.1.0
# via
# -c ./ingest/../deps/constraints.txt
# -r ./ingest/chroma.in
# build
# opentelemetry-api
importlib-metadata==8.2.0
# via -r ./ingest/chroma.in
importlib-resources==6.4.0
# via chromadb
kubernetes==30.1.0
# via chromadb
mmh3==4.1.0
# via chromadb
monotonic==1.6
# via posthog
mpmath==1.3.0
Expand All @@ -128,46 +108,21 @@ oauthlib==3.2.2
# requests-oauthlib
onnxruntime==1.18.1
# via chromadb
opentelemetry-api==1.26.0
opentelemetry-api==1.16.0
# via
# chromadb
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-instrumentation
# opentelemetry-instrumentation-asgi
# opentelemetry-instrumentation-fastapi
# opentelemetry-sdk
# opentelemetry-semantic-conventions
opentelemetry-exporter-otlp-proto-common==1.26.0
# via opentelemetry-exporter-otlp-proto-grpc
opentelemetry-exporter-otlp-proto-grpc==1.26.0
opentelemetry-exporter-otlp-proto-grpc==1.16.0
# via chromadb
opentelemetry-instrumentation==0.47b0
# via
# opentelemetry-instrumentation-asgi
# opentelemetry-instrumentation-fastapi
opentelemetry-instrumentation-asgi==0.47b0
# via opentelemetry-instrumentation-fastapi
opentelemetry-instrumentation-fastapi==0.47b0
# via chromadb
opentelemetry-proto==1.26.0
# via
# opentelemetry-exporter-otlp-proto-common
# opentelemetry-exporter-otlp-proto-grpc
opentelemetry-sdk==1.26.0
opentelemetry-proto==1.16.0
# via opentelemetry-exporter-otlp-proto-grpc
opentelemetry-sdk==1.16.0
# via
# chromadb
# opentelemetry-exporter-otlp-proto-grpc
opentelemetry-semantic-conventions==0.47b0
# via
# opentelemetry-instrumentation-asgi
# opentelemetry-instrumentation-fastapi
# opentelemetry-sdk
opentelemetry-util-http==0.47b0
# via
# opentelemetry-instrumentation-asgi
# opentelemetry-instrumentation-fastapi
orjson==3.10.6
# via chromadb
opentelemetry-semantic-conventions==0.37b0
# via opentelemetry-sdk
overrides==7.7.0
# via chromadb
packaging==23.2
Expand All @@ -185,6 +140,8 @@ protobuf==4.23.4
# googleapis-common-protos
# onnxruntime
# opentelemetry-proto
pulsar-client==3.5.0
# via chromadb
pyasn1==0.6.0
# via
# pyasn1-modules
Expand All @@ -199,8 +156,6 @@ pydantic-core==2.20.1
# via pydantic
pypika==0.48.9
# via chromadb
pyproject-hooks==1.1.0
# via build
python-dateutil==2.9.0.post0
# via
# -c ./ingest/../base.txt
Expand All @@ -217,6 +172,7 @@ pyyaml==6.0.2
requests==2.32.3
# via
# -c ./ingest/../base.txt
# chromadb
# huggingface-hub
# kubernetes
# posthog
Expand Down Expand Up @@ -246,8 +202,6 @@ tenacity==8.5.0
# chromadb
tokenizers==0.19.1
# via chromadb
tomli==2.0.1
# via build
tqdm==4.66.5
# via
# -c ./ingest/../base.txt
Expand All @@ -260,7 +214,6 @@ typer==0.9.0
typing-extensions==4.12.2
# via
# -c ./ingest/../base.txt
# asgiref
# chromadb
# fastapi
# huggingface-hub
Expand All @@ -280,7 +233,7 @@ uvicorn[standard]==0.30.5
# via chromadb
uvloop==0.19.0
# via uvicorn
watchfiles==0.22.0
watchfiles==0.23.0
# via uvicorn
websocket-client==1.8.0
# via kubernetes
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/databricks-volumes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ charset-normalizer==3.3.2
# requests
databricks-sdk==0.29.0
# via -r ./ingest/databricks-volumes.in
google-auth==2.32.0
google-auth==2.33.0
# via databricks-sdk
idna==3.7
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/discord.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile ./ingest/discord.in
#
aiohappyeyeballs==2.3.4
aiohappyeyeballs==2.3.5
# via aiohttp
aiohttp==3.10.1
# via discord-py
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/elasticsearch.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile ./ingest/elasticsearch.in
#
aiohappyeyeballs==2.3.4
aiohappyeyeballs==2.3.5
# via aiohttp
aiohttp==3.10.1
# via elasticsearch
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/embed-aws-bedrock.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile ./ingest/embed-aws-bedrock.in
#
aiohappyeyeballs==2.3.4
aiohappyeyeballs==2.3.5
# via aiohttp
aiohttp==3.10.1
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/embed-octoai.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ idna==3.7
# requests
jiter==0.5.0
# via openai
openai==1.40.0
openai==1.40.1
# via -r ./ingest/embed-octoai.in
pydantic==2.8.2
# via openai
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/embed-openai.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ langchain-openai==0.1.20
# via -r ./ingest/embed-openai.in
langsmith==0.1.98
# via langchain-core
openai==1.40.0
openai==1.40.1
# via langchain-openai
orjson==3.10.6
# via langsmith
Expand Down
6 changes: 3 additions & 3 deletions requirements/ingest/embed-vertexai.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile ./ingest/embed-vertexai.in
#
aiohappyeyeballs==2.3.4
aiohappyeyeballs==2.3.5
# via aiohttp
aiohttp==3.10.1
# via
Expand Down Expand Up @@ -48,7 +48,7 @@ google-api-core[grpc]==2.19.1
# google-cloud-core
# google-cloud-resource-manager
# google-cloud-storage
google-auth==2.32.0
google-auth==2.33.0
# via
# google-api-core
# google-cloud-aiplatform
Expand All @@ -66,7 +66,7 @@ google-cloud-core==2.4.1
# google-cloud-storage
google-cloud-resource-manager==1.12.5
# via google-cloud-aiplatform
google-cloud-storage==2.18.0
google-cloud-storage==2.18.1
# via
# google-cloud-aiplatform
# langchain-google-vertexai
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/embed-voyageai.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile ./ingest/embed-voyageai.in
#
aiohappyeyeballs==2.3.4
aiohappyeyeballs==2.3.5
# via aiohttp
aiohttp==3.10.1
# via
Expand Down
6 changes: 3 additions & 3 deletions requirements/ingest/gcs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile ./ingest/gcs.in
#
aiohappyeyeballs==2.3.4
aiohappyeyeballs==2.3.5
# via aiohttp
aiohttp==3.10.1
# via gcsfs
Expand Down Expand Up @@ -48,7 +48,7 @@ google-api-core==2.19.1
# via
# google-cloud-core
# google-cloud-storage
google-auth==2.32.0
google-auth==2.33.0
# via
# gcsfs
# google-api-core
Expand All @@ -59,7 +59,7 @@ google-auth-oauthlib==1.2.1
# via gcsfs
google-cloud-core==2.4.1
# via google-cloud-storage
google-cloud-storage==2.18.0
google-cloud-storage==2.18.1
# via gcsfs
google-crc32c==1.5.0
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/google-drive.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ google-api-core==2.19.1
# via google-api-python-client
google-api-python-client==2.140.0
# via -r ./ingest/google-drive.in
google-auth==2.32.0
google-auth==2.33.0
# via
# google-api-core
# google-api-python-client
Expand Down
Loading
Loading