Skip to content

Commit cb923b9

Browse files
authored
build(deps): dependency cleanup (#1102)
Cleans up some pins that were prone to conflicts. All pins belong in constraints.in.
1 parent d835fb1 commit cb923b9

24 files changed

+52
-65
lines changed

Diff for: CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
## 0.9.3-dev3
1+
## 0.9.3
22

33
### Enhancements
44

5+
* Pinned dependency cleanup.
56
* Update `partition_csv` to always use `soupparser_fromstring` to parse `html text`
67
* Update `partition_tsv` to always use `soupparser_fromstring` to parse `html text`
78
* Add `metadata.section` to capture epub table of contents data

Diff for: MANIFEST.in

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
include requirements/base.in
22
include requirements/huggingface.in
3-
include requirements/local-inference.in
43
include requirements/ingest-s3.in
5-
include requirements/ingest-gcs.in
6-
include requirements/ingest-dropbox.in
74
include requirements/ingest-azure.in
85
include requirements/ingest-discord.in
96
include requirements/ingest-github.in
107
include requirements/ingest-gitlab.in
118
include requirements/ingest-reddit.in
9+
include requirements/ingest-notion.in
1210
include requirements/ingest-slack.in
1311
include requirements/ingest-wikipedia.in
1412
include requirements/ingest-google-drive.in
15-
include requirements/ingest-outlook.in
16-
include requirements/ingest-onedrive.in
13+
include requirements/ingest-gcs.in
14+
include requirements/ingest-elasticsearch.in
15+
include requirements/ingest-dropbox.in
1716
include requirements/ingest-box.in
17+
include requirements/ingest-onedrive.in
18+
include requirements/ingest-outlook.in
19+
include requirements/ingest-confluence.in
20+
include requirements/ingest-airtable.in
21+
include requirements/ingest-sharepoint.in

Diff for: Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ install-ingest-confluence:
165165
install-ingest-airtable:
166166
python3 -m pip install -r requirements/ingest-airtable.txt
167167

168+
.PHONY: install-ingest-sharepoint
169+
install-ingest-sharepoint:
170+
python3 -m pip install -r requirements/ingest-sharepoint.txt
171+
168172
.PHONY: install-unstructured-inference
169173
install-unstructured-inference:
170174
python3 -m pip install -r requirements/local-inference.txt
@@ -220,6 +224,8 @@ pip-compile:
220224
pip-compile --upgrade requirements/ingest-outlook.in
221225
pip-compile --upgrade requirements/ingest-confluence.in
222226
pip-compile --upgrade requirements/ingest-airtable.in
227+
pip-compile --upgrade requirements/ingest-sharepoint.in
228+
pip-compile --upgrade requirements/ingest-notion.in
223229

224230
## install-project-local: install unstructured into your local python environment
225231
.PHONY: install-project-local

Diff for: requirements/constraints.in

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@ IPython<8.13
2222
# NOTE(robinson) - See this issue here
2323
# https://github.com/facebookresearch/detectron2/issues/5010
2424
Pillow<10.0.0
25-
26-
cryptography==41.0.2
25+
# NOTE(alan) Pinned to avoid error that occurs with 2.4.3:
26+
# AttributeError: 'ResourcePath' object has no attribute 'collection'
27+
Office365-REST-Python-Client<2.4.3

Diff for: requirements/dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ defusedxml==0.7.1
6868
# via nbconvert
6969
distlib==0.3.7
7070
# via virtualenv
71-
exceptiongroup==1.1.2
71+
exceptiongroup==1.1.3
7272
# via
7373
# -c requirements/test.txt
7474
# anyio

Diff for: requirements/extra-pdf-image.in

-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ pdfminer.six
77
# https://github.com/facebookresearch/detectron2/issues/5010
88
Pillow<10
99
unstructured-inference==0.5.9
10-
# consistency with other ingest-*.in
11-
cryptography==41.0.2

Diff for: requirements/extra-pdf-image.txt

+3-6
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,8 @@ coloredlogs==15.0.1
2222
# via onnxruntime
2323
contourpy==1.1.0
2424
# via matplotlib
25-
cryptography==41.0.2
26-
# via
27-
# -c requirements/constraints.in
28-
# -r requirements/extra-pdf-image.in
29-
# pdfminer-six
25+
cryptography==41.0.3
26+
# via pdfminer-six
3027
cycler==0.11.0
3128
# via matplotlib
3229
effdet==0.4.1
@@ -127,7 +124,7 @@ protobuf==4.23.4
127124
# via
128125
# -c requirements/constraints.in
129126
# onnxruntime
130-
pycocotools==2.0.6
127+
pycocotools==2.0.7
131128
# via effdet
132129
pycparser==2.21
133130
# via cffi

Diff for: requirements/ingest-azure.in

-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
-c base.txt
33
adlfs
44
fsspec
5-
# consistency with other ingest-*.in
6-
cryptography==41.0.2

Diff for: requirements/ingest-azure.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@ charset-normalizer==3.2.0
3939
# -c requirements/base.txt
4040
# aiohttp
4141
# requests
42-
cryptography==41.0.2
42+
cryptography==41.0.3
4343
# via
44-
# -c requirements/constraints.in
45-
# -r requirements/ingest-azure.in
4644
# azure-identity
4745
# azure-storage-blob
4846
# msal

Diff for: requirements/ingest-box.in

-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
-c base.txt
33
boxfs
44
fsspec
5-
# consistency with other ingest-*.in
6-
cryptography==41.0.2

Diff for: requirements/ingest-box.txt

+2-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@ charset-normalizer==3.2.0
2121
# via
2222
# -c requirements/base.txt
2323
# requests
24-
cryptography==41.0.2
25-
# via
26-
# -c requirements/constraints.in
27-
# -r requirements/ingest-box.in
28-
# boxsdk
24+
cryptography==41.0.3
25+
# via boxsdk
2926
fsspec==2023.6.0
3027
# via
3128
# -r requirements/ingest-box.in

Diff for: requirements/ingest-gcs.txt

-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ protobuf==4.23.4
7474
# via
7575
# -c requirements/constraints.in
7676
# google-api-core
77-
# googleapis-common-protos
7877
pyasn1==0.5.0
7978
# via
8079
# pyasn1-modules

Diff for: requirements/ingest-github.in

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
-c constraints.in
22
-c base.txt
33
# NOTE - pygithub==1.58.0 fails due to https://github.com/PyGithub/PyGithub/issues/2436
4-
# In the future, we can update this to pygithub>1.58.0
5-
pygithub==1.58.2
6-
# consistency with other ingest-*.in
7-
cryptography==41.0.2
4+
pygithub>1.58.0

Diff for: requirements/ingest-github.txt

+3-6
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@ charset-normalizer==3.2.0
1717
# via
1818
# -c requirements/base.txt
1919
# requests
20-
cryptography==41.0.2
21-
# via
22-
# -c requirements/constraints.in
23-
# -r requirements/ingest-github.in
24-
# pyjwt
20+
cryptography==41.0.3
21+
# via pyjwt
2522
deprecated==1.2.14
2623
# via pygithub
2724
idna==3.4
@@ -30,7 +27,7 @@ idna==3.4
3027
# requests
3128
pycparser==2.21
3229
# via cffi
33-
pygithub==1.58.2
30+
pygithub==1.59.1
3431
# via -r requirements/ingest-github.in
3532
pyjwt[crypto]==2.8.0
3633
# via pygithub

Diff for: requirements/ingest-notion.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ certifi==2023.7.22
1212
# -c requirements/constraints.in
1313
# httpcore
1414
# httpx
15-
exceptiongroup==1.1.2
15+
exceptiongroup==1.1.3
1616
# via anyio
1717
h11==0.14.0
1818
# via httpcore

Diff for: requirements/ingest-onedrive.in

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
-c constraints.in
22
-c base.txt
33
msal
4-
Office365-REST-Python-Client==2.4.2
5-
cryptography==41.0.2
4+
Office365-REST-Python-Client<2.4.3

Diff for: requirements/ingest-onedrive.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ charset-normalizer==3.2.0
1515
# via
1616
# -c requirements/base.txt
1717
# requests
18-
cryptography==41.0.2
18+
cryptography==41.0.3
1919
# via
20-
# -c requirements/constraints.in
21-
# -r requirements/ingest-onedrive.in
2220
# msal
2321
# pyjwt
2422
idna==3.4
@@ -30,7 +28,9 @@ msal==1.23.0
3028
# -r requirements/ingest-onedrive.in
3129
# office365-rest-python-client
3230
office365-rest-python-client==2.4.2
33-
# via -r requirements/ingest-onedrive.in
31+
# via
32+
# -c requirements/constraints.in
33+
# -r requirements/ingest-onedrive.in
3434
pycparser==2.21
3535
# via cffi
3636
pyjwt[crypto]==2.8.0

Diff for: requirements/ingest-outlook.in

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
-c constraints.in
22
-c base.txt
33
msal
4-
Office365-REST-Python-Client==2.4.2
5-
cryptography==41.0.2
4+
Office365-REST-Python-Client<2.4.3

Diff for: requirements/ingest-outlook.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ charset-normalizer==3.2.0
1515
# via
1616
# -c requirements/base.txt
1717
# requests
18-
cryptography==41.0.2
18+
cryptography==41.0.3
1919
# via
20-
# -c requirements/constraints.in
21-
# -r requirements/ingest-outlook.in
2220
# msal
2321
# pyjwt
2422
idna==3.4
@@ -30,7 +28,9 @@ msal==1.23.0
3028
# -r requirements/ingest-outlook.in
3129
# office365-rest-python-client
3230
office365-rest-python-client==2.4.2
33-
# via -r requirements/ingest-outlook.in
31+
# via
32+
# -c requirements/constraints.in
33+
# -r requirements/ingest-outlook.in
3434
pycparser==2.21
3535
# via cffi
3636
pyjwt[crypto]==2.8.0

Diff for: requirements/ingest-sharepoint.in

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
-c constraints.in
22
-c base.txt
3-
msal==1.23.0
4-
Office365-REST-Python-Client==2.4.2
5-
pyjwt==2.8.0
6-
cryptography==41.0.2
3+
msal
4+
Office365-REST-Python-Client<2.4.3

Diff for: requirements/ingest-sharepoint.txt

+5-6
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ charset-normalizer==3.2.0
1515
# via
1616
# -c requirements/base.txt
1717
# requests
18-
cryptography==41.0.2
18+
cryptography==41.0.3
1919
# via
20-
# -r requirements/ingest-sharepoint.in
2120
# msal
2221
# pyjwt
2322
idna==3.4
@@ -29,13 +28,13 @@ msal==1.23.0
2928
# -r requirements/ingest-sharepoint.in
3029
# office365-rest-python-client
3130
office365-rest-python-client==2.4.2
32-
# via -r requirements/ingest-sharepoint.in
31+
# via
32+
# -c requirements/constraints.in
33+
# -r requirements/ingest-sharepoint.in
3334
pycparser==2.21
3435
# via cffi
3536
pyjwt[crypto]==2.8.0
36-
# via
37-
# -r requirements/ingest-sharepoint.in
38-
# msal
37+
# via msal
3938
pytz==2023.3
4039
# via office365-rest-python-client
4140
requests==2.31.0

Diff for: requirements/test.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ coverage[toml]==7.3.0
2626
# via
2727
# -r requirements/test.in
2828
# pytest-cov
29-
exceptiongroup==1.1.2
29+
exceptiongroup==1.1.3
3030
# via pytest
3131
flake8==6.1.0
3232
# via -r requirements/test.in

Diff for: setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ def load_requirements(file_list: Optional[Union[str, List[str]]] = None) -> List
141141
"outlook": load_requirements("requirements/ingest-outlook.in"),
142142
"confluence": load_requirements("requirements/ingest-confluence.in"),
143143
"airtable": load_requirements("requirements/ingest-airtable.in"),
144+
"sharepoint": load_requirements("requirements/ingest-sharepoint.in"),
144145
# Legacy extra requirements
145146
"huggingface": load_requirements("requirements/huggingface.in"),
146147
"local-inference": all_doc_reqs,

Diff for: unstructured/__version__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.9.3-dev3" # pragma: no cover
1+
__version__ = "0.9.3" # pragma: no cover

0 commit comments

Comments
 (0)