Fix: docker build with missing dependency (#931)

* pip -compile

* test trigger

* Revert "test trigger"

This reverts commit 69d4c8cd9f285f6ef4bf445f5fb27b5c62e1391c.

* version conflict and pip compile
This commit is contained in:
Yuming Long 2023-07-14 18:20:11 -04:00 committed by GitHub
parent 685e33f890
commit 067eb5701f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 138 additions and 162 deletions

View File

@ -110,4 +110,3 @@ jobs:
VERSION=$(grep -Po '(?<=__version__ = ")[^"]*' unstructured/__version__.py)
docker manifest create ${DOCKER_REPOSITORY}:$VERSION $DOCKER_BUILD_REPOSITORY:amd64 $DOCKER_BUILD_REPOSITORY:arm64
docker manifest push $DOCKER_REPOSITORY:$VERSION

View File

@ -143,6 +143,7 @@ pip-compile:
pip-compile --upgrade requirements/ingest-wikipedia.in
pip-compile --upgrade requirements/ingest-google-drive.in
pip-compile --upgrade requirements/ingest-elasticsearch.in
pip-compile --upgrade requirements/ingest-onedrive.in
## install-project-local: install unstructured into your local python environment
.PHONY: install-project-local

View File

@ -73,5 +73,5 @@ sphinxcontrib-serializinghtml==1.1.5
# via sphinx
urllib3==2.0.3
# via requests
zipp==3.16.0
zipp==3.16.1
# via importlib-metadata

View File

@ -16,9 +16,9 @@ charset-normalizer==3.2.0
# via
# pdfminer-six
# requests
click==8.1.4
click==8.1.5
# via nltk
cryptography==41.0.1
cryptography==41.0.2
# via pdfminer-six
et-xmlfile==1.1.0
# via openpyxl
@ -92,5 +92,5 @@ xlrd==2.0.1
# via -r requirements/base.in
xlsxwriter==3.1.2
# via python-pptx
zipp==3.16.0
zipp==3.16.1
# via importlib-metadata

View File

@ -73,5 +73,5 @@ sphinxcontrib-serializinghtml==1.1.5
# via sphinx
urllib3==2.0.3
# via requests
zipp==3.16.0
zipp==3.16.1
# via importlib-metadata

View File

@ -39,7 +39,7 @@ cffi==1.15.1
# argon2-cffi-bindings
cfgv==3.3.1
# via pre-commit
click==8.1.4
click==8.1.5
# via
# -c requirements/base.txt
# -c requirements/test.txt
@ -116,7 +116,7 @@ jinja2==3.1.2
# notebook
jsonpointer==2.4
# via jsonschema
jsonschema[format-nongpl]==4.18.0
jsonschema[format-nongpl]==4.18.3
# via
# jupyter-events
# nbformat
@ -228,7 +228,7 @@ platformdirs==3.8.1
# virtualenv
pre-commit==3.3.3
# via -r requirements/dev.in
prometheus-client==0.17.0
prometheus-client==0.17.1
# via
# jupyter-server
# nbclassic
@ -382,7 +382,7 @@ wheel==0.40.0
# pip-tools
widgetsnbextension==4.0.8
# via ipywidgets
zipp==3.16.0
zipp==3.16.1
# via
# -c requirements/base.txt
# importlib-metadata

View File

@ -13,7 +13,7 @@ charset-normalizer==3.2.0
# via
# -c requirements/base.txt
# requests
click==8.1.4
click==8.1.5
# via
# -c requirements/base.txt
# sacremoses

View File

@ -23,7 +23,7 @@ azure-datalake-store==0.0.53
# via adlfs
azure-identity==1.13.0
# via adlfs
azure-storage-blob==12.16.0
azure-storage-blob==12.17.0
# via adlfs
certifi==2023.5.7
# via
@ -40,14 +40,14 @@ charset-normalizer==3.2.0
# -c requirements/base.txt
# aiohttp
# requests
cryptography==41.0.1
cryptography==41.0.2
# via
# -c requirements/base.txt
# azure-identity
# azure-storage-blob
# msal
# pyjwt
frozenlist==1.3.3
frozenlist==1.4.0
# via
# aiohttp
# aiosignal

View File

@ -18,7 +18,7 @@ charset-normalizer==3.2.0
# aiohttp
discord-py==2.3.1
# via -r requirements/ingest-discord.in
frozenlist==1.3.3
frozenlist==1.4.0
# via
# aiohttp
# aiosignal

View File

@ -16,31 +16,31 @@ cachetools==5.3.1
# via google-auth
certifi==2023.5.7
# via
# -c base.txt
# -c constraints.in
# -c requirements/base.txt
# -c requirements/constraints.in
# requests
charset-normalizer==3.2.0
# via
# -c base.txt
# -c requirements/base.txt
# aiohttp
# requests
decorator==5.1.1
# via gcsfs
frozenlist==1.3.3
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
fsspec==2023.6.0
# via
# -r ingest-gcs.in
# -r requirements/ingest-gcs.in
# gcsfs
gcsfs==2023.6.0
# via -r ingest-gcs.in
# via -r requirements/ingest-gcs.in
google-api-core==2.11.1
# via
# google-cloud-core
# google-cloud-storage
google-auth==2.21.0
google-auth==2.22.0
# via
# gcsfs
# google-api-core
@ -61,7 +61,7 @@ googleapis-common-protos==1.59.1
# via google-api-core
idna==3.4
# via
# -c base.txt
# -c requirements/base.txt
# requests
# yarl
multidict==6.0.4
@ -72,7 +72,7 @@ oauthlib==3.2.2
# via requests-oauthlib
protobuf==4.23.4
# via
# -c constraints.in
# -c requirements/constraints.in
# google-api-core
pyasn1==0.5.0
# via
@ -82,7 +82,7 @@ pyasn1-modules==0.3.0
# via google-auth
requests==2.31.0
# via
# -c base.txt
# -c requirements/base.txt
# gcsfs
# google-api-core
# google-cloud-storage
@ -93,12 +93,12 @@ rsa==4.9
# via google-auth
six==1.16.0
# via
# -c base.txt
# -c requirements/base.txt
# google-auth
urllib3==1.26.16
# via
# -c base.txt
# -c constraints.in
# -c requirements/base.txt
# -c requirements/constraints.in
# google-auth
# requests
yarl==1.9.2

View File

@ -18,7 +18,7 @@ charset-normalizer==3.2.0
# via
# -c requirements/base.txt
# requests
cryptography==41.0.1
cryptography==41.0.2
# via
# -c requirements/base.txt
# pyjwt

View File

@ -8,18 +8,18 @@ cachetools==5.3.1
# via google-auth
certifi==2023.5.7
# via
# -c base.txt
# -c constraints.in
# -c requirements/base.txt
# -c requirements/constraints.in
# requests
charset-normalizer==3.2.0
# via
# -c base.txt
# -c requirements/base.txt
# requests
google-api-core==2.11.1
# via google-api-python-client
google-api-python-client==2.93.0
# via -r ingest-google-drive.in
google-auth==2.21.0
# via -r requirements/ingest-google-drive.in
google-auth==2.22.0
# via
# google-api-core
# google-api-python-client
@ -34,11 +34,11 @@ httplib2==0.22.0
# google-auth-httplib2
idna==3.4
# via
# -c base.txt
# -c requirements/base.txt
# requests
protobuf==4.23.4
# via
# -c constraints.in
# -c requirements/constraints.in
# google-api-core
# googleapis-common-protos
pyasn1==0.5.0
@ -49,24 +49,24 @@ pyasn1-modules==0.3.0
# via google-auth
pyparsing==3.0.9
# via
# -c constraints.in
# -c requirements/constraints.in
# httplib2
requests==2.31.0
# via
# -c base.txt
# -c requirements/base.txt
# google-api-core
rsa==4.9
# via google-auth
six==1.16.0
# via
# -c base.txt
# -c requirements/base.txt
# google-auth
# google-auth-httplib2
uritemplate==4.1.1
# via google-api-python-client
urllib3==1.26.16
# via
# -c base.txt
# -c constraints.in
# -c requirements/base.txt
# -c requirements/constraints.in
# google-auth
# requests

View File

@ -1,4 +1,5 @@
-c constraints.in
-c base.txt
msal
Office365-REST-Python-Client
Office365-REST-Python-Client
cryptography==41.0.2

View File

@ -2,53 +2,54 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile ingest-onedrive.in
# pip-compile requirements/ingest-onedrive.in
#
certifi==2023.5.7
# via
# -c base.txt
# -c constraints.in
# -c requirements/base.txt
# -c requirements/constraints.in
# requests
cffi==1.15.1
# via
# -c base.txt
# -c requirements/base.txt
# cryptography
charset-normalizer==3.2.0
# via
# -c base.txt
# -c requirements/base.txt
# requests
cryptography==41.0.1
cryptography==41.0.2
# via
# -c base.txt
# -c requirements/base.txt
# -r requirements/ingest-onedrive.in
# msal
# pyjwt
idna==3.4
# via
# -c base.txt
# -c requirements/base.txt
# requests
msal==1.22.0
# via
# -r ingest-onedrive.in
# -r requirements/ingest-onedrive.in
# office365-rest-python-client
office365-rest-python-client==2.4.1
# via -r ingest-onedrive.in
office365-rest-python-client==2.4.2
# via -r requirements/ingest-onedrive.in
pycparser==2.21
# via
# -c base.txt
# -c requirements/base.txt
# cffi
pyjwt[crypto]==2.7.0
# via msal
pytz==2023.3
# via
# -c base.txt
# -c requirements/base.txt
# office365-rest-python-client
requests==2.31.0
# via
# -c base.txt
# -c requirements/base.txt
# msal
# office365-rest-python-client
urllib3==1.26.16
# via
# -c base.txt
# -c constraints.in
# -c requirements/base.txt
# -c requirements/constraints.in
# requests

View File

@ -6,32 +6,32 @@
#
certifi==2023.5.7
# via
# -c base.txt
# -c constraints.in
# -c requirements/base.txt
# -c requirements/constraints.in
# requests
charset-normalizer==3.2.0
# via
# -c base.txt
# -c requirements/base.txt
# requests
idna==3.4
# via
# -c base.txt
# -c requirements/base.txt
# requests
praw==7.7.1
# via -r ingest-reddit.in
# via -r requirements/ingest-reddit.in
prawcore==2.3.0
# via praw
requests==2.31.0
# via
# -c base.txt
# -c requirements/base.txt
# prawcore
# update-checker
update-checker==0.18.0
# via praw
urllib3==1.26.16
# via
# -c base.txt
# -c constraints.in
# -c requirements/base.txt
# -c requirements/constraints.in
# requests
websocket-client==1.6.1
# via praw

View File

@ -24,7 +24,7 @@ charset-normalizer==3.2.0
# via
# -c requirements/base.txt
# aiohttp
frozenlist==1.3.3
frozenlist==1.4.0
# via
# aiohttp
# aiosignal

View File

@ -8,27 +8,25 @@ antlr4-python3-runtime==4.9.3
# via omegaconf
certifi==2023.5.7
# via
# -c base.txt
# -c constraints.in
# -c requirements/base.txt
# -c requirements/constraints.in
# requests
cffi==1.15.1
# via
# -c base.txt
# -c requirements/base.txt
# cryptography
charset-normalizer==3.2.0
# via
# -c base.txt
# -c requirements/base.txt
# pdfminer-six
# requests
cmake==3.26.4
# via triton
coloredlogs==15.0.1
# via onnxruntime
contourpy==1.1.0
# via matplotlib
cryptography==41.0.1
cryptography==41.0.2
# via
# -c base.txt
# -c requirements/base.txt
# pdfminer-six
cycler==0.11.0
# via matplotlib
@ -39,10 +37,9 @@ filelock==3.12.2
# huggingface-hub
# torch
# transformers
# triton
flatbuffers==23.5.26
# via onnxruntime
fonttools==4.40.0
fonttools==4.41.0
# via matplotlib
fsspec==2023.6.0
# via huggingface-hub
@ -55,8 +52,10 @@ humanfriendly==10.0
# via coloredlogs
idna==3.4
# via
# -c base.txt
# -c requirements/base.txt
# requests
importlib-resources==6.0.0
# via matplotlib
iopath==0.1.10
# via layoutparser
jinja2==3.1.2
@ -65,8 +64,6 @@ kiwisolver==1.4.4
# via matplotlib
layoutparser[layoutmodels,tesseract]==0.3.4
# via unstructured-inference
lit==16.0.6
# via triton
markupsafe==2.1.3
# via jinja2
matplotlib==3.7.2
@ -77,7 +74,7 @@ networkx==3.1
# via torch
numpy==1.24.4
# via
# -c base.txt
# -c requirements/base.txt
# contourpy
# layoutparser
# matplotlib
@ -88,31 +85,6 @@ numpy==1.24.4
# scipy
# torchvision
# transformers
nvidia-cublas-cu11==11.10.3.66
# via
# nvidia-cudnn-cu11
# nvidia-cusolver-cu11
# torch
nvidia-cuda-cupti-cu11==11.7.101
# via torch
nvidia-cuda-nvrtc-cu11==11.7.99
# via torch
nvidia-cuda-runtime-cu11==11.7.99
# via torch
nvidia-cudnn-cu11==8.5.0.96
# via torch
nvidia-cufft-cu11==10.9.0.58
# via torch
nvidia-curand-cu11==10.2.10.91
# via torch
nvidia-cusolver-cu11==11.4.0.1
# via torch
nvidia-cusparse-cu11==11.7.4.91
# via torch
nvidia-nccl-cu11==2.14.3
# via torch
nvidia-nvtx-cu11==11.7.91
# via torch
omegaconf==2.3.0
# via effdet
onnxruntime==1.15.1
@ -130,21 +102,21 @@ packaging==23.1
# transformers
pandas==2.0.3
# via
# -c base.txt
# -c requirements/base.txt
# layoutparser
pdf2image==1.16.3
# via
# -c base.txt
# -c requirements/base.txt
# layoutparser
pdfminer-six==20221105
# via
# -c base.txt
# -c requirements/base.txt
# pdfplumber
pdfplumber==0.9.0
# via layoutparser
pillow==10.0.0
# via
# -c base.txt
# -c requirements/base.txt
# layoutparser
# matplotlib
# pdf2image
@ -155,30 +127,30 @@ portalocker==2.7.0
# via iopath
protobuf==4.23.4
# via
# -c constraints.in
# -c requirements/constraints.in
# onnxruntime
pycocotools==2.0.6
# via effdet
pycparser==2.21
# via
# -c base.txt
# -c requirements/base.txt
# cffi
pyparsing==3.0.9
# via
# -c constraints.in
# -c requirements/constraints.in
# matplotlib
pytesseract==0.3.10
# via layoutparser
python-dateutil==2.8.2
# via
# -c base.txt
# -c requirements/base.txt
# matplotlib
# pandas
python-multipart==0.0.6
# via unstructured-inference
pytz==2023.3
# via
# -c base.txt
# -c requirements/base.txt
# pandas
pyyaml==6.0
# via
@ -189,11 +161,11 @@ pyyaml==6.0
# transformers
regex==2023.6.3
# via
# -c base.txt
# -c requirements/base.txt
# transformers
requests==2.31.0
# via
# -c base.txt
# -c requirements/base.txt
# huggingface-hub
# torchvision
# transformers
@ -205,7 +177,7 @@ scipy==1.10.1
# via layoutparser
six==1.16.0
# via
# -c base.txt
# -c requirements/base.txt
# python-dateutil
sympy==1.12
# via
@ -221,7 +193,6 @@ torch==2.0.1
# layoutparser
# timm
# torchvision
# triton
torchvision==0.15.2
# via
# effdet
@ -229,14 +200,12 @@ torchvision==0.15.2
# timm
tqdm==4.65.0
# via
# -c base.txt
# -c requirements/base.txt
# huggingface-hub
# iopath
# transformers
transformers==4.30.2
# via unstructured-inference
triton==2.0.0
# via torch
typing-extensions==4.7.1
# via
# huggingface-hub
@ -244,23 +213,18 @@ typing-extensions==4.7.1
# torch
tzdata==2023.3
# via
# -c base.txt
# -c requirements/base.txt
# pandas
unstructured-inference==0.5.5
# via -r local-inference.in
# via -r requirements/local-inference.in
urllib3==1.26.16
# via
# -c base.txt
# -c constraints.in
# -c requirements/base.txt
# -c requirements/constraints.in
# requests
wand==0.6.11
# via pdfplumber
wheel==0.40.0
zipp==3.16.1
# via
# -c constraints.in
# nvidia-cublas-cu11
# nvidia-cuda-cupti-cu11
# nvidia-cuda-runtime-cu11
# nvidia-curand-cu11
# nvidia-cusparse-cu11
# nvidia-nvtx-cu11
# -c requirements/base.txt
# importlib-resources

View File

@ -7,45 +7,47 @@
appdirs==1.4.4
# via label-studio-tools
black==23.7.0
# via -r test.in
# via -r requirements/test.in
certifi==2023.5.7
# via
# -c base.txt
# -c constraints.in
# -c requirements/base.txt
# -c requirements/constraints.in
# requests
charset-normalizer==3.2.0
# via
# -c base.txt
# -c requirements/base.txt
# requests
click==8.1.4
click==8.1.5
# via
# -c base.txt
# -r test.in
# -c requirements/base.txt
# -r requirements/test.in
# black
coverage[toml]==7.2.7
# via
# -r test.in
# -r requirements/test.in
# pytest-cov
exceptiongroup==1.1.2
# via pytest
flake8==6.0.0
# via -r test.in
# via -r requirements/test.in
freezegun==1.2.2
# via -r test.in
# via -r requirements/test.in
grpcio==1.56.0
# via -r test.in
# via -r requirements/test.in
idna==3.4
# via
# -c base.txt
# -c requirements/base.txt
# requests
# yarl
iniconfig==2.0.0
# via pytest
label-studio-sdk==0.0.29
# via -r test.in
# via -r requirements/test.in
label-studio-tools==0.0.2
# via label-studio-sdk
lxml==4.9.3
# via
# -c base.txt
# -c requirements/base.txt
# label-studio-sdk
# label-studio-tools
mccabe==0.7.0
@ -53,7 +55,7 @@ mccabe==0.7.0
multidict==6.0.4
# via yarl
mypy==1.4.1
# via -r test.in
# via -r requirements/test.in
mypy-extensions==1.0.0
# via
# black
@ -79,45 +81,53 @@ pytest==7.4.0
# pytest-cov
# pytest-mock
pytest-cov==4.1.0
# via -r test.in
# via -r requirements/test.in
pytest-mock==3.11.1
# via -r test.in
# via -r requirements/test.in
python-dateutil==2.8.2
# via
# -c base.txt
# -c requirements/base.txt
# freezegun
pyyaml==6.0
# via vcrpy
requests==2.31.0
# via
# -c base.txt
# -c requirements/base.txt
# label-studio-sdk
ruff==0.0.277
# via -r test.in
ruff==0.0.278
# via -r requirements/test.in
six==1.16.0
# via
# -c base.txt
# -c requirements/base.txt
# python-dateutil
# vcrpy
tomli==2.0.1
# via
# black
# coverage
# mypy
# pytest
types-markdown==3.4.2.9
# via -r test.in
# via -r requirements/test.in
types-requests==2.31.0.1
# via -r test.in
# via -r requirements/test.in
types-tabulate==0.9.0.2
# via -r test.in
# via -r requirements/test.in
types-urllib3==1.26.25.13
# via types-requests
typing-extensions==4.7.1
# via
# black
# mypy
# pydantic
urllib3==1.26.16
# via
# -c base.txt
# -c constraints.in
# -c requirements/base.txt
# -c requirements/constraints.in
# requests
# vcrpy
vcrpy==5.0.0
# via -r test.in
# via -r requirements/test.in
wrapt==1.15.0
# via vcrpy
yarl==1.9.2