From 399dd603111faf7bf95f3b6d40fa80b4dc8d412e Mon Sep 17 00:00:00 2001 From: qued <64741807+qued@users.noreply.github.com> Date: Tue, 30 Jan 2024 15:29:08 -0600 Subject: [PATCH] build(deps): unpin pillow (#2472) Removed `pillow` pin and recompiled. I think it was originally there to address a conflict, which, as far as I can tell, no longer exists. Also a security vulnerability was discovered in the older version of `pillow`. #### Testing: CI should pass. --- requirements/constraints.in | 1 - requirements/dev.txt | 4 ++-- requirements/extra-csv.txt | 2 +- requirements/extra-paddleocr.txt | 7 +++---- requirements/extra-pdf-image.txt | 7 +++---- requirements/extra-pptx.txt | 6 ++---- requirements/extra-xlsx.txt | 2 +- requirements/ingest/airtable.txt | 2 +- requirements/ingest/azure.txt | 4 ++-- requirements/ingest/chroma.txt | 6 +++--- requirements/ingest/discord.txt | 2 +- requirements/ingest/embed-aws-bedrock.txt | 10 +++++----- requirements/ingest/embed-huggingface.txt | 23 ++++++++--------------- requirements/ingest/embed-openai.txt | 12 ++++++------ requirements/ingest/gcs.txt | 2 +- requirements/ingest/onedrive.txt | 2 +- requirements/ingest/outlook.txt | 2 +- requirements/ingest/s3.txt | 2 +- requirements/ingest/salesforce.txt | 5 ++--- requirements/ingest/sharepoint.txt | 2 +- requirements/test.txt | 6 +++--- 21 files changed, 48 insertions(+), 61 deletions(-) diff --git a/requirements/constraints.in b/requirements/constraints.in index a88cacaa1..f618cc1a9 100644 --- a/requirements/constraints.in +++ b/requirements/constraints.in @@ -47,4 +47,3 @@ opencv-python==4.8.0.76 opencv-contrib-python==4.8.0.76 onnxruntime==1.15.1 platformdirs==3.10.0 -pillow<=10.0.1 diff --git a/requirements/dev.txt b/requirements/dev.txt index e01afba19..fce545b1e 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -212,7 +212,7 @@ notebook-shim==0.2.3 # via # jupyterlab # notebook -overrides==7.6.0 +overrides==7.7.0 # via jupyter-server packaging==23.2 # via @@ -292,7 +292,7 @@ qtconsole==5.5.1 # via jupyter qtpy==2.4.1 # via qtconsole -referencing==0.32.1 +referencing==0.33.0 # via # jsonschema # jsonschema-specifications diff --git a/requirements/extra-csv.txt b/requirements/extra-csv.txt index 834391b4b..ba192f70f 100644 --- a/requirements/extra-csv.txt +++ b/requirements/extra-csv.txt @@ -14,7 +14,7 @@ python-dateutil==2.8.2 # via # -c base.txt # pandas -pytz==2023.3.post1 +pytz==2023.4 # via pandas six==1.16.0 # via diff --git a/requirements/extra-paddleocr.txt b/requirements/extra-paddleocr.txt index 217a9bd5c..bdd614163 100644 --- a/requirements/extra-paddleocr.txt +++ b/requirements/extra-paddleocr.txt @@ -130,9 +130,8 @@ pandas==2.2.0 # via visualdl pdf2image==1.17.0 # via unstructured-paddleocr -pillow==10.0.1 +pillow==10.2.0 # via - # -c constraints.in # imageio # imgaug # matplotlib @@ -162,7 +161,7 @@ python-dateutil==2.8.2 # -c base.txt # matplotlib # pandas -pytz==2023.3.post1 +pytz==2023.4 # via # flask-babel # pandas @@ -198,7 +197,7 @@ six==1.16.0 # imgaug # python-dateutil # visualdl -tifffile==2023.12.9 +tifffile==2024.1.30 # via scikit-image tqdm==4.66.1 # via diff --git a/requirements/extra-pdf-image.txt b/requirements/extra-pdf-image.txt index 614f88b79..9fa9bc9ef 100644 --- a/requirements/extra-pdf-image.txt +++ b/requirements/extra-pdf-image.txt @@ -132,9 +132,8 @@ pdfplumber==0.10.3 # via layoutparser pikepdf==8.11.0 # via -r extra-pdf-image.in -pillow==10.0.1 +pillow==10.2.0 # via - # -c constraints.in # layoutparser # matplotlib # pdf2image @@ -163,7 +162,7 @@ pyparsing==3.0.9 # via # -c constraints.in # matplotlib -pypdf==4.0.0 +pypdf==4.0.1 # via -r extra-pdf-image.in pypdfium2==4.26.0 # via pdfplumber @@ -176,7 +175,7 @@ python-dateutil==2.8.2 # pandas python-multipart==0.0.6 # via unstructured-inference -pytz==2023.3.post1 +pytz==2023.4 # via pandas pyyaml==6.0.1 # via diff --git a/requirements/extra-pptx.txt b/requirements/extra-pptx.txt index ec9ac5b04..f0fccf17e 100644 --- a/requirements/extra-pptx.txt +++ b/requirements/extra-pptx.txt @@ -6,10 +6,8 @@ # lxml==5.1.0 # via python-pptx -pillow==10.0.1 - # via - # -c constraints.in - # python-pptx +pillow==10.2.0 + # via python-pptx python-pptx==0.6.23 # via -r extra-pptx.in xlsxwriter==3.1.9 diff --git a/requirements/extra-xlsx.txt b/requirements/extra-xlsx.txt index 75e6abd4e..3dc9ed315 100644 --- a/requirements/extra-xlsx.txt +++ b/requirements/extra-xlsx.txt @@ -20,7 +20,7 @@ python-dateutil==2.8.2 # via # -c base.txt # pandas -pytz==2023.3.post1 +pytz==2023.4 # via pandas six==1.16.0 # via diff --git a/requirements/ingest/airtable.txt b/requirements/ingest/airtable.txt index dd1ef4d1e..ef1516c64 100644 --- a/requirements/ingest/airtable.txt +++ b/requirements/ingest/airtable.txt @@ -19,7 +19,7 @@ idna==3.6 # requests inflection==0.5.1 # via pyairtable -pyairtable==2.2.1 +pyairtable==2.2.2 # via -r ingest/airtable.in pydantic==1.10.14 # via diff --git a/requirements/ingest/azure.txt b/requirements/ingest/azure.txt index be4352bb7..4536176e8 100644 --- a/requirements/ingest/azure.txt +++ b/requirements/ingest/azure.txt @@ -4,9 +4,9 @@ # # pip-compile --output-file=ingest/azure.txt ingest/azure.in # -adlfs==2023.12.0 +adlfs==2024.1.0 # via -r ingest/azure.in -aiohttp==3.9.1 +aiohttp==3.9.3 # via adlfs aiosignal==1.3.1 # via aiohttp diff --git a/requirements/ingest/chroma.txt b/requirements/ingest/chroma.txt index d0fc01bb4..8d59d3698 100644 --- a/requirements/ingest/chroma.txt +++ b/requirements/ingest/chroma.txt @@ -145,7 +145,7 @@ opentelemetry-util-http==0.43b0 # via # opentelemetry-instrumentation-asgi # opentelemetry-instrumentation-fastapi -overrides==7.6.0 +overrides==7.7.0 # via chromadb packaging==23.2 # via @@ -153,7 +153,7 @@ packaging==23.2 # build # huggingface-hub # onnxruntime -posthog==3.3.2 +posthog==3.3.3 # via chromadb protobuf==4.23.4 # via @@ -248,7 +248,7 @@ urllib3==1.26.18 # -c ingest/../constraints.in # kubernetes # requests -uvicorn[standard]==0.27.0 +uvicorn[standard]==0.27.0.post1 # via chromadb uvloop==0.19.0 # via uvicorn diff --git a/requirements/ingest/discord.txt b/requirements/ingest/discord.txt index 1152c66f1..8b5433960 100644 --- a/requirements/ingest/discord.txt +++ b/requirements/ingest/discord.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=ingest/discord.txt ingest/discord.in # -aiohttp==3.9.1 +aiohttp==3.9.3 # via discord-py aiosignal==1.3.1 # via aiohttp diff --git a/requirements/ingest/embed-aws-bedrock.txt b/requirements/ingest/embed-aws-bedrock.txt index d72007358..f962d7eb9 100644 --- a/requirements/ingest/embed-aws-bedrock.txt +++ b/requirements/ingest/embed-aws-bedrock.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=ingest/embed-aws-bedrock.txt ingest/embed-aws-bedrock.in # -aiohttp==3.9.1 +aiohttp==3.9.3 # via # langchain # langchain-community @@ -65,15 +65,15 @@ jsonpatch==1.33 # langchain-core jsonpointer==2.4 # via jsonpatch -langchain==0.1.3 +langchain==0.1.4 # via -r ingest/embed-aws-bedrock.in -langchain-community==0.0.15 +langchain-community==0.0.16 # via langchain -langchain-core==0.1.15 +langchain-core==0.1.17 # via # langchain # langchain-community -langsmith==0.0.83 +langsmith==0.0.84 # via # langchain # langchain-community diff --git a/requirements/ingest/embed-huggingface.txt b/requirements/ingest/embed-huggingface.txt index d02ab5b72..191380fa5 100644 --- a/requirements/ingest/embed-huggingface.txt +++ b/requirements/ingest/embed-huggingface.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=ingest/embed-huggingface.txt ingest/embed-huggingface.in # -aiohttp==3.9.1 +aiohttp==3.9.3 # via # langchain # langchain-community @@ -79,15 +79,15 @@ jsonpatch==1.33 # langchain-core jsonpointer==2.4 # via jsonpatch -langchain==0.1.3 +langchain==0.1.4 # via -r ingest/embed-huggingface.in -langchain-community==0.0.15 +langchain-community==0.0.16 # via langchain -langchain-core==0.1.15 +langchain-core==0.1.17 # via # langchain # langchain-community -langsmith==0.0.83 +langsmith==0.0.84 # via # langchain # langchain-community @@ -122,7 +122,6 @@ numpy==1.26.3 # scikit-learn # scipy # sentence-transformers - # torchvision # transformers packaging==23.2 # via @@ -131,10 +130,8 @@ packaging==23.2 # langchain-core # marshmallow # transformers -pillow==10.0.1 - # via - # -c ingest/../constraints.in - # torchvision +pillow==10.2.0 + # via sentence-transformers pydantic==1.10.14 # via # -c ingest/../constraints.in @@ -161,7 +158,6 @@ requests==2.31.0 # langchain-community # langchain-core # langsmith - # torchvision # transformers safetensors==0.3.2 # via @@ -174,7 +170,7 @@ scipy==1.10.1 # -c ingest/../constraints.in # scikit-learn # sentence-transformers -sentence-transformers==2.2.2 +sentence-transformers==2.3.0 # via -r ingest/embed-huggingface.in sentencepiece==0.1.99 # via sentence-transformers @@ -199,9 +195,6 @@ torch==2.1.2 # via # -c ingest/../constraints.in # sentence-transformers - # torchvision -torchvision==0.16.2 - # via sentence-transformers tqdm==4.66.1 # via # -c ingest/../base.txt diff --git a/requirements/ingest/embed-openai.txt b/requirements/ingest/embed-openai.txt index ab30e01de..69dcfa4f6 100644 --- a/requirements/ingest/embed-openai.txt +++ b/requirements/ingest/embed-openai.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=ingest/embed-openai.txt ingest/embed-openai.in # -aiohttp==3.9.1 +aiohttp==3.9.3 # via # langchain # langchain-community @@ -65,15 +65,15 @@ jsonpatch==1.33 # langchain-core jsonpointer==2.4 # via jsonpatch -langchain==0.1.3 +langchain==0.1.4 # via -r ingest/embed-openai.in -langchain-community==0.0.15 +langchain-community==0.0.16 # via langchain -langchain-core==0.1.15 +langchain-core==0.1.17 # via # langchain # langchain-community -langsmith==0.0.83 +langsmith==0.0.84 # via # langchain # langchain-community @@ -95,7 +95,7 @@ numpy==1.26.3 # -c ingest/../base.txt # langchain # langchain-community -openai==1.9.0 +openai==1.10.0 # via -r ingest/embed-openai.in packaging==23.2 # via diff --git a/requirements/ingest/gcs.txt b/requirements/ingest/gcs.txt index 9c401b8ac..a55167190 100644 --- a/requirements/ingest/gcs.txt +++ b/requirements/ingest/gcs.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=ingest/gcs.txt ingest/gcs.in # -aiohttp==3.9.1 +aiohttp==3.9.3 # via gcsfs aiosignal==1.3.1 # via aiohttp diff --git a/requirements/ingest/onedrive.txt b/requirements/ingest/onedrive.txt index c2fdc8601..f0b26e7c8 100644 --- a/requirements/ingest/onedrive.txt +++ b/requirements/ingest/onedrive.txt @@ -41,7 +41,7 @@ pycparser==2.21 # via cffi pyjwt[crypto]==2.8.0 # via msal -pytz==2023.3.post1 +pytz==2023.4 # via office365-rest-python-client requests==2.31.0 # via diff --git a/requirements/ingest/outlook.txt b/requirements/ingest/outlook.txt index 1378697a3..451dfb58a 100644 --- a/requirements/ingest/outlook.txt +++ b/requirements/ingest/outlook.txt @@ -35,7 +35,7 @@ pycparser==2.21 # via cffi pyjwt[crypto]==2.8.0 # via msal -pytz==2023.3.post1 +pytz==2023.4 # via office365-rest-python-client requests==2.31.0 # via diff --git a/requirements/ingest/s3.txt b/requirements/ingest/s3.txt index d686008a7..52524480b 100644 --- a/requirements/ingest/s3.txt +++ b/requirements/ingest/s3.txt @@ -6,7 +6,7 @@ # aiobotocore==2.7.0 # via s3fs -aiohttp==3.9.1 +aiohttp==3.9.3 # via # aiobotocore # s3fs diff --git a/requirements/ingest/salesforce.txt b/requirements/ingest/salesforce.txt index 4bc71e67d..f3d72462c 100644 --- a/requirements/ingest/salesforce.txt +++ b/requirements/ingest/salesforce.txt @@ -46,7 +46,7 @@ python-dateutil==2.8.2 # -c ingest/../base.txt # pendulum # time-machine -pytz==2023.3.post1 +pytz==2023.4 # via zeep requests==2.31.0 # via @@ -55,7 +55,7 @@ requests==2.31.0 # requests-toolbelt # simple-salesforce # zeep -requests-file==1.5.1 +requests-file==2.0.0 # via zeep requests-toolbelt==1.0.0 # via zeep @@ -66,7 +66,6 @@ six==1.16.0 # -c ingest/../base.txt # isodate # python-dateutil - # requests-file time-machine==2.13.0 # via pendulum tzdata==2023.4 diff --git a/requirements/ingest/sharepoint.txt b/requirements/ingest/sharepoint.txt index 1c849cf1c..f3bb413c3 100644 --- a/requirements/ingest/sharepoint.txt +++ b/requirements/ingest/sharepoint.txt @@ -35,7 +35,7 @@ pycparser==2.21 # via cffi pyjwt[crypto]==2.8.0 # via msal -pytz==2023.3.post1 +pytz==2023.4 # via office365-rest-python-client requests==2.31.0 # via diff --git a/requirements/test.txt b/requirements/test.txt index c49b5613f..7ca4b61ac 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -24,7 +24,7 @@ click==8.1.7 # -c base.txt # -r test.in # black -coverage[toml]==7.4.0 +coverage[toml]==7.4.1 # via # -r test.in # pytest-cov @@ -93,7 +93,7 @@ pyflakes==3.2.0 # via # autoflake # flake8 -pytest==7.4.4 +pytest==8.0.0 # via # pytest-cov # pytest-mock @@ -126,7 +126,7 @@ tomli==2.0.1 # pytest types-click==7.1.8 # via -r test.in -types-markdown==3.5.0.20240106 +types-markdown==3.5.0.20240129 # via -r test.in types-requests==2.31.0.6 # via -r test.in