From b4b8ac4d8a8d8cb362a12ef106d2d7fa07e8c48d Mon Sep 17 00:00:00 2001 From: cragwolfe Date: Sun, 13 Aug 2023 13:42:12 -0700 Subject: [PATCH] chore: run make pip-compile on mac (#1107) so cuda deps removed. --- docs/requirements.txt | 23 +++++++------ requirements/build.txt | 23 +++++++------ requirements/dev.txt | 33 +++++++++++++++---- requirements/extra-epub.txt | 2 +- requirements/extra-pdf-image.txt | 52 ++++-------------------------- requirements/extra-xlsx.txt | 4 --- requirements/huggingface.txt | 48 +-------------------------- requirements/ingest-airtable.txt | 2 +- requirements/ingest-azure.txt | 1 + requirements/ingest-box.txt | 5 ++- requirements/ingest-confluence.txt | 2 +- requirements/ingest-discord.txt | 2 +- requirements/ingest-github.txt | 5 ++- requirements/ingest-onedrive.txt | 1 + requirements/ingest-outlook.txt | 1 + requirements/ingest-wikipedia.txt | 8 +++-- requirements/test.txt | 13 +++----- 17 files changed, 82 insertions(+), 143 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index e3f8681005..3140b57e84 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -9,7 +9,9 @@ alabaster==0.7.13 babel==2.12.1 # via sphinx beautifulsoup4==4.12.2 - # via furo + # via + # -c requirements/base.txt + # furo certifi==2023.7.22 # via # -c requirements/base.txt @@ -53,36 +55,33 @@ requests==2.31.0 snowballstemmer==2.2.0 # via sphinx soupsieve==2.4.1 - # via beautifulsoup4 + # via + # -c requirements/base.txt + # beautifulsoup4 sphinx==6.2.1 # via # -r requirements/build.in # furo # sphinx-basic-ng # sphinx-rtd-theme - # sphinxcontrib-applehelp - # sphinxcontrib-devhelp - # sphinxcontrib-htmlhelp # sphinxcontrib-jquery - # sphinxcontrib-qthelp - # sphinxcontrib-serializinghtml sphinx-basic-ng==1.0.0b2 # via furo sphinx-rtd-theme==1.2.2 # via -r requirements/build.in -sphinxcontrib-applehelp==1.0.6 +sphinxcontrib-applehelp==1.0.4 # via sphinx -sphinxcontrib-devhelp==1.0.4 +sphinxcontrib-devhelp==1.0.2 # via sphinx -sphinxcontrib-htmlhelp==2.0.3 +sphinxcontrib-htmlhelp==2.0.1 # via sphinx sphinxcontrib-jquery==4.1 # via sphinx-rtd-theme sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.5 +sphinxcontrib-qthelp==1.0.3 # via sphinx -sphinxcontrib-serializinghtml==1.1.7 +sphinxcontrib-serializinghtml==1.1.5 # via sphinx urllib3==1.26.16 # via diff --git a/requirements/build.txt b/requirements/build.txt index e3f8681005..3140b57e84 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -9,7 +9,9 @@ alabaster==0.7.13 babel==2.12.1 # via sphinx beautifulsoup4==4.12.2 - # via furo + # via + # -c requirements/base.txt + # furo certifi==2023.7.22 # via # -c requirements/base.txt @@ -53,36 +55,33 @@ requests==2.31.0 snowballstemmer==2.2.0 # via sphinx soupsieve==2.4.1 - # via beautifulsoup4 + # via + # -c requirements/base.txt + # beautifulsoup4 sphinx==6.2.1 # via # -r requirements/build.in # furo # sphinx-basic-ng # sphinx-rtd-theme - # sphinxcontrib-applehelp - # sphinxcontrib-devhelp - # sphinxcontrib-htmlhelp # sphinxcontrib-jquery - # sphinxcontrib-qthelp - # sphinxcontrib-serializinghtml sphinx-basic-ng==1.0.0b2 # via furo sphinx-rtd-theme==1.2.2 # via -r requirements/build.in -sphinxcontrib-applehelp==1.0.6 +sphinxcontrib-applehelp==1.0.4 # via sphinx -sphinxcontrib-devhelp==1.0.4 +sphinxcontrib-devhelp==1.0.2 # via sphinx -sphinxcontrib-htmlhelp==2.0.3 +sphinxcontrib-htmlhelp==2.0.1 # via sphinx sphinxcontrib-jquery==4.1 # via sphinx-rtd-theme sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.5 +sphinxcontrib-qthelp==1.0.3 # via sphinx -sphinxcontrib-serializinghtml==1.1.7 +sphinxcontrib-serializinghtml==1.1.5 # via sphinx urllib3==1.26.16 # via diff --git a/requirements/dev.txt b/requirements/dev.txt index 5d1401b88f..3e06aea103 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -6,6 +6,10 @@ # anyio==3.7.1 # via jupyter-server +appnope==0.1.3 + # via + # ipykernel + # ipython argon2-cffi==21.3.0 # via jupyter-server argon2-cffi-bindings==21.2.0 @@ -25,7 +29,9 @@ babel==2.12.1 backcall==0.2.0 # via ipython beautifulsoup4==4.12.2 - # via nbconvert + # via + # -c requirements/base.txt + # nbconvert bleach==6.0.0 # via nbconvert build==0.10.0 @@ -38,7 +44,7 @@ certifi==2023.7.22 # requests cffi==1.15.1 # via argon2-cffi-bindings -cfgv==3.3.1 +cfgv==3.4.0 # via pre-commit charset-normalizer==3.2.0 # via @@ -83,6 +89,19 @@ idna==3.4 # anyio # jsonschema # requests +importlib-metadata==6.8.0 + # via + # jupyter-client + # jupyter-lsp + # jupyterlab + # jupyterlab-server + # nbconvert +importlib-resources==6.0.1 + # via + # jsonschema + # jsonschema-specifications + # jupyterlab + # notebook ipykernel==6.25.1 # via # jupyter @@ -157,7 +176,7 @@ jupyter-server==2.7.0 # notebook-shim jupyter-server-terminals==0.4.4 # via jupyter-server -jupyterlab==4.0.4 +jupyterlab==4.0.5 # via notebook jupyterlab-pygments==0.2.2 # via nbconvert @@ -313,7 +332,9 @@ six==1.16.0 sniffio==1.3.0 # via anyio soupsieve==2.4.1 - # via beautifulsoup4 + # via + # -c requirements/base.txt + # beautifulsoup4 stack-data==0.6.2 # via ipython terminado==0.17.1 @@ -329,7 +350,7 @@ tomli==2.0.1 # jupyterlab # pip-tools # pyproject-hooks -tornado==6.3.2 +tornado==6.3.3 # via # ipykernel # jupyter-client @@ -367,7 +388,7 @@ urllib3==1.26.16 # -c requirements/constraints.in # -c requirements/test.txt # requests -virtualenv==20.24.2 +virtualenv==20.24.3 # via pre-commit wcwidth==0.2.6 # via prompt-toolkit diff --git a/requirements/extra-epub.txt b/requirements/extra-epub.txt index fcc718824d..6b461bb847 100644 --- a/requirements/extra-epub.txt +++ b/requirements/extra-epub.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # pip-compile requirements/extra-epub.in diff --git a/requirements/extra-pdf-image.txt b/requirements/extra-pdf-image.txt index ec233404bf..a6d8613843 100644 --- a/requirements/extra-pdf-image.txt +++ b/requirements/extra-pdf-image.txt @@ -18,14 +18,15 @@ charset-normalizer==3.2.0 # -c requirements/base.txt # pdfminer-six # requests -cmake==3.27.1 - # via triton coloredlogs==15.0.1 # via onnxruntime contourpy==1.1.0 # via matplotlib cryptography==41.0.2 - # via pdfminer-six + # via + # -c requirements/constraints.in + # -r requirements/extra-pdf-image.in + # pdfminer-six cycler==0.11.0 # via matplotlib effdet==0.4.1 @@ -35,7 +36,6 @@ filelock==3.12.2 # huggingface-hub # torch # transformers - # triton flatbuffers==23.5.26 # via onnxruntime fonttools==4.42.0 @@ -63,8 +63,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 @@ -86,31 +84,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 @@ -215,7 +188,6 @@ torch==2.0.1 # layoutparser # timm # torchvision - # triton torchvision==0.15.2 # via # effdet @@ -229,8 +201,6 @@ tqdm==4.66.1 # transformers transformers==4.31.0 # via unstructured-inference -triton==2.0.0 - # via torch typing-extensions==4.7.1 # via # huggingface-hub @@ -245,15 +215,5 @@ urllib3==1.26.16 # -c requirements/base.txt # -c requirements/constraints.in # requests -wheel==0.41.1 - # via - # -c requirements/constraints.in - # nvidia-cublas-cu11 - # nvidia-cuda-cupti-cu11 - # nvidia-cuda-runtime-cu11 - # nvidia-curand-cu11 - # nvidia-cusparse-cu11 - # nvidia-nvtx-cu11 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +zipp==3.16.2 + # via importlib-resources diff --git a/requirements/extra-xlsx.txt b/requirements/extra-xlsx.txt index 179d966108..f29e3b339e 100644 --- a/requirements/extra-xlsx.txt +++ b/requirements/extra-xlsx.txt @@ -4,8 +4,6 @@ # # pip-compile requirements/extra-xlsx.in # -beautifulsoup4==4.12.2 - # via -r requirements/extra-xlsx.in et-xmlfile==1.1.0 # via openpyxl numpy==1.24.4 @@ -22,8 +20,6 @@ pytz==2023.3 # via pandas six==1.16.0 # via python-dateutil -soupsieve==2.4.1 - # via beautifulsoup4 tzdata==2023.3 # via pandas xlrd==2.0.1 diff --git a/requirements/huggingface.txt b/requirements/huggingface.txt index 9e78c50923..dd340a704f 100644 --- a/requirements/huggingface.txt +++ b/requirements/huggingface.txt @@ -17,14 +17,11 @@ click==8.1.6 # via # -c requirements/base.txt # sacremoses -cmake==3.27.1 - # via triton filelock==3.12.2 # via # huggingface-hub # torch # transformers - # triton fsspec==2023.6.0 # via huggingface-hub huggingface-hub==0.16.4 @@ -41,8 +38,6 @@ joblib==1.3.2 # sacremoses langdetect==1.0.9 # via -r requirements/huggingface.in -lit==16.0.6 - # via triton markupsafe==2.1.3 # via jinja2 mpmath==1.3.0 @@ -53,31 +48,6 @@ numpy==1.24.4 # via # -c requirements/constraints.in # 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 packaging==23.1 # via # huggingface-hub @@ -111,9 +81,7 @@ sympy==1.12 tokenizers==0.13.3 # via transformers torch==2.0.1 - # via - # -r requirements/huggingface.in - # triton + # via -r requirements/huggingface.in tqdm==4.66.1 # via # -c requirements/base.txt @@ -122,8 +90,6 @@ tqdm==4.66.1 # transformers transformers==4.31.0 # via -r requirements/huggingface.in -triton==2.0.0 - # via torch typing-extensions==4.7.1 # via # huggingface-hub @@ -133,15 +99,3 @@ urllib3==1.26.16 # -c requirements/base.txt # -c requirements/constraints.in # requests -wheel==0.41.1 - # via - # -c requirements/constraints.in - # nvidia-cublas-cu11 - # nvidia-cuda-cupti-cu11 - # nvidia-cuda-runtime-cu11 - # nvidia-curand-cu11 - # nvidia-cusparse-cu11 - # nvidia-nvtx-cu11 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/ingest-airtable.txt b/requirements/ingest-airtable.txt index fe29769849..06d1df3254 100644 --- a/requirements/ingest-airtable.txt +++ b/requirements/ingest-airtable.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # pip-compile requirements/ingest-airtable.in diff --git a/requirements/ingest-azure.txt b/requirements/ingest-azure.txt index 896578f6c6..a9408e4a7e 100644 --- a/requirements/ingest-azure.txt +++ b/requirements/ingest-azure.txt @@ -41,6 +41,7 @@ charset-normalizer==3.2.0 # requests cryptography==41.0.2 # via + # -c requirements/constraints.in # -r requirements/ingest-azure.in # azure-identity # azure-storage-blob diff --git a/requirements/ingest-box.txt b/requirements/ingest-box.txt index a4337a93ff..9f0e008459 100644 --- a/requirements/ingest-box.txt +++ b/requirements/ingest-box.txt @@ -22,7 +22,10 @@ charset-normalizer==3.2.0 # -c requirements/base.txt # requests cryptography==41.0.2 - # via boxsdk + # via + # -c requirements/constraints.in + # -r requirements/ingest-box.in + # boxsdk fsspec==2023.6.0 # via # -r requirements/ingest-box.in diff --git a/requirements/ingest-confluence.txt b/requirements/ingest-confluence.txt index 4a85cb2223..64fbe02092 100644 --- a/requirements/ingest-confluence.txt +++ b/requirements/ingest-confluence.txt @@ -4,7 +4,7 @@ # # pip-compile requirements/ingest-confluence.in # -atlassian-python-api==3.40.0 +atlassian-python-api==3.40.1 # via -r requirements/ingest-confluence.in certifi==2023.7.22 # via diff --git a/requirements/ingest-discord.txt b/requirements/ingest-discord.txt index 52952ad55e..72d0250723 100644 --- a/requirements/ingest-discord.txt +++ b/requirements/ingest-discord.txt @@ -16,7 +16,7 @@ charset-normalizer==3.2.0 # via # -c requirements/base.txt # aiohttp -discord-py==2.3.1 +discord-py==2.3.2 # via -r requirements/ingest-discord.in frozenlist==1.4.0 # via diff --git a/requirements/ingest-github.txt b/requirements/ingest-github.txt index c8dfb81ddd..e381208c5e 100644 --- a/requirements/ingest-github.txt +++ b/requirements/ingest-github.txt @@ -18,7 +18,10 @@ charset-normalizer==3.2.0 # -c requirements/base.txt # requests cryptography==41.0.2 - # via pyjwt + # via + # -c requirements/constraints.in + # -r requirements/ingest-github.in + # pyjwt deprecated==1.2.14 # via pygithub idna==3.4 diff --git a/requirements/ingest-onedrive.txt b/requirements/ingest-onedrive.txt index c2244c5280..ec848438c1 100644 --- a/requirements/ingest-onedrive.txt +++ b/requirements/ingest-onedrive.txt @@ -17,6 +17,7 @@ charset-normalizer==3.2.0 # requests cryptography==41.0.2 # via + # -c requirements/constraints.in # -r requirements/ingest-onedrive.in # msal # pyjwt diff --git a/requirements/ingest-outlook.txt b/requirements/ingest-outlook.txt index 2e163dcef2..f3e418fcce 100644 --- a/requirements/ingest-outlook.txt +++ b/requirements/ingest-outlook.txt @@ -17,6 +17,7 @@ charset-normalizer==3.2.0 # requests cryptography==41.0.2 # via + # -c requirements/constraints.in # -r requirements/ingest-outlook.in # msal # pyjwt diff --git a/requirements/ingest-wikipedia.txt b/requirements/ingest-wikipedia.txt index 7455fb82c4..65c383636a 100644 --- a/requirements/ingest-wikipedia.txt +++ b/requirements/ingest-wikipedia.txt @@ -5,7 +5,9 @@ # pip-compile requirements/ingest-wikipedia.in # beautifulsoup4==4.12.2 - # via wikipedia + # via + # -c requirements/base.txt + # wikipedia certifi==2023.7.22 # via # -c requirements/base.txt @@ -24,7 +26,9 @@ requests==2.31.0 # -c requirements/base.txt # wikipedia soupsieve==2.4.1 - # via beautifulsoup4 + # via + # -c requirements/base.txt + # beautifulsoup4 urllib3==1.26.16 # via # -c requirements/base.txt diff --git a/requirements/test.txt b/requirements/test.txt index 3df2e0a0a5..e7b286b87b 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,8 +4,6 @@ # # pip-compile requirements/test.in # -annotated-types==0.5.0 - # via pydantic appdirs==1.4.4 # via label-studio-tools black==23.7.0 @@ -24,7 +22,7 @@ click==8.1.6 # -c requirements/base.txt # -r requirements/test.in # black -coverage[toml]==7.2.7 +coverage[toml]==7.3.0 # via # -r requirements/test.in # pytest-cov @@ -74,10 +72,10 @@ pluggy==1.2.0 # via pytest pycodestyle==2.11.0 # via flake8 -pydantic<2 - # via label-studio-sdk -pydantic-core==2.4.0 - # via pydantic +pydantic==1.10.12 + # via + # -r requirements/test.in + # label-studio-sdk pyflakes==3.1.0 # via flake8 pytest==7.4.0 @@ -121,7 +119,6 @@ typing-extensions==4.7.1 # black # mypy # pydantic - # pydantic-core urllib3==1.26.16 # via # -c requirements/base.txt