Skip to content

Commit 7d66a23

Browse files
authored
fix: correctly install mesa-gl for arm (#3647)
### Summary Fixes the `arm64` image builds, which will be available again starting in version `0.15.13`. A fix was implemented upstream in Unstructured-IO/base-images#47 and a workaround that installed `x86` packages in the `unstructured` repo was removed. ### Testing See [this job](https://github.com/Unstructured-IO/unstructured/actions/runs/10948943594/job/30401108059?pr=3647) for a successful `arm64` build on the feature branch.
1 parent 0ed69a1 commit 7d66a23

36 files changed

+198
-156
lines changed

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 0.15.13-dev3
1+
## 0.15.13
22

33
### Enhancements
44

@@ -9,6 +9,7 @@
99
### Fixes
1010

1111
* **Fixes high memory overhead for intersection area computation** Using `numpy.float32` for coordinates and remove intermediate variables to reduce memory usage when computing intersection areas
12+
* **Fixes the `arm64` image build** `arm64` builds are now fixed and will be available against starting with the `0.15.13` release.
1213

1314
## 0.15.12
1415

Dockerfile

-11
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,6 @@ COPY unstructured unstructured
99
COPY test_unstructured test_unstructured
1010
COPY example-docs example-docs
1111

12-
# NOTE(robinson) - temporary workaround to install mesa-gl 24.1.0 because
13-
# libgallum is missing in mesa-gl 24.2.0 from the wolfi package manager
14-
RUN wget "https://utic-public-cf.s3.amazonaws.com/mesa-gl-24.1.0-r0.718c913d.apk" && \
15-
wget "https://utic-public-cf.s3.amazonaws.com/mesa-glapi-24.1.0-r0.4390a503.apk" && \
16-
apk del mesa-gl && \
17-
apk add --allow-untrusted mesa-gl-24.1.0-r0.718c913d.apk && \
18-
apk add --allow-untrusted mesa-glapi-24.1.0-r0.4390a503.apk && \
19-
rm mesa-gl-24.1.0-r0.718c913d.apk && \
20-
rm mesa-glapi-24.1.0-r0.4390a503.apk
21-
22-
2312
RUN chown -R notebook-user:notebook-user /app && \
2413
apk add font-ubuntu git && \
2514
fc-cache -fv && \

requirements/base.txt

+10-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile ./base.in
66
#
7-
anyio==4.4.0
7+
anyio==4.5.0
88
# via httpx
99
backoff==2.2.1
1010
# via -r ./base.in
@@ -16,6 +16,8 @@ certifi==2024.8.30
1616
# httpx
1717
# requests
1818
# unstructured-client
19+
cffi==1.17.1
20+
# via cryptography
1921
chardet==5.2.0
2022
# via -r ./base.in
2123
charset-normalizer==3.3.2
@@ -26,13 +28,15 @@ click==8.1.7
2628
# via
2729
# nltk
2830
# python-oxmsg
31+
cryptography==43.0.1
32+
# via unstructured-client
2933
dataclasses-json==0.6.7
3034
# via
3135
# -r ./base.in
3236
# unstructured-client
3337
deepdiff==8.0.1
3438
# via unstructured-client
35-
emoji==2.12.1
39+
emoji==2.13.0
3640
# via -r ./base.in
3741
exceptiongroup==1.2.2
3842
# via anyio
@@ -82,7 +86,9 @@ packaging==24.1
8286
# unstructured-client
8387
psutil==6.0.0
8488
# via -r ./base.in
85-
pypdf==4.3.1
89+
pycparser==2.22
90+
# via cffi
91+
pypdf==5.0.0
8692
# via unstructured-client
8793
python-dateutil==2.9.0.post0
8894
# via unstructured-client
@@ -133,7 +139,7 @@ typing-inspect==0.9.0
133139
# via
134140
# dataclasses-json
135141
# unstructured-client
136-
unstructured-client==0.25.8
142+
unstructured-client==0.25.9
137143
# via -r ./base.in
138144
urllib3==1.26.20
139145
# via

requirements/dev.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ click==8.1.7
1515
# pip-tools
1616
distlib==0.3.8
1717
# via virtualenv
18-
filelock==3.16.0
18+
filelock==3.16.1
1919
# via virtualenv
2020
identify==2.6.1
2121
# via pre-commit
@@ -32,7 +32,7 @@ packaging==24.1
3232
# build
3333
pip-tools==7.4.1
3434
# via -r ./dev.in
35-
platformdirs==4.3.3
35+
platformdirs==4.3.6
3636
# via
3737
# -c ./test.txt
3838
# virtualenv
@@ -51,7 +51,7 @@ tomli==2.0.1
5151
# -c ./test.txt
5252
# build
5353
# pip-tools
54-
virtualenv==20.26.4
54+
virtualenv==20.26.5
5555
# via pre-commit
5656
wheel==0.44.0
5757
# via pip-tools

requirements/extra-paddleocr.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile ./extra-paddleocr.in
66
#
7-
anyio==4.4.0
7+
anyio==4.5.0
88
# via
99
# -c ./base.txt
1010
# httpx
@@ -113,7 +113,7 @@ pillow==10.4.0
113113
# pdf2image
114114
# scikit-image
115115
# unstructured-paddleocr
116-
protobuf==4.25.4
116+
protobuf==4.25.5
117117
# via
118118
# -c ././deps/constraints.txt
119119
# paddlepaddle

requirements/extra-pdf-image.txt

+16-10
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ certifi==2024.8.30
1313
# -c ./base.txt
1414
# requests
1515
cffi==1.17.1
16-
# via cryptography
16+
# via
17+
# -c ./base.txt
18+
# cryptography
1719
charset-normalizer==3.3.2
1820
# via
1921
# -c ./base.txt
@@ -24,14 +26,16 @@ coloredlogs==15.0.1
2426
contourpy==1.3.0
2527
# via matplotlib
2628
cryptography==43.0.1
27-
# via pdfminer-six
29+
# via
30+
# -c ./base.txt
31+
# pdfminer-six
2832
cycler==0.12.1
2933
# via matplotlib
3034
deprecated==1.2.14
3135
# via pikepdf
3236
effdet==0.4.1
3337
# via -r ./extra-pdf-image.in
34-
filelock==3.16.0
38+
filelock==3.16.1
3539
# via
3640
# huggingface-hub
3741
# torch
@@ -44,9 +48,9 @@ fsspec==2024.9.0
4448
# via
4549
# huggingface-hub
4650
# torch
47-
google-api-core[grpc]==2.19.2
51+
google-api-core[grpc]==2.20.0
4852
# via google-cloud-vision
49-
google-auth==2.34.0
53+
google-auth==2.35.0
5054
# via
5155
# google-api-core
5256
# google-cloud-vision
@@ -63,7 +67,7 @@ grpcio==1.66.1
6367
# grpcio-status
6468
grpcio-status==1.62.3
6569
# via google-api-core
66-
huggingface-hub==0.24.7
70+
huggingface-hub==0.25.0
6771
# via
6872
# timm
6973
# tokenizers
@@ -166,7 +170,7 @@ proto-plus==1.24.0
166170
# via
167171
# google-api-core
168172
# google-cloud-vision
169-
protobuf==4.25.4
173+
protobuf==4.25.5
170174
# via
171175
# -c ././deps/constraints.txt
172176
# google-api-core
@@ -185,10 +189,12 @@ pyasn1-modules==0.4.1
185189
pycocotools==2.0.8
186190
# via effdet
187191
pycparser==2.22
188-
# via cffi
192+
# via
193+
# -c ./base.txt
194+
# cffi
189195
pyparsing==3.1.4
190196
# via matplotlib
191-
pypdf==4.3.1
197+
pypdf==5.0.0
192198
# via
193199
# -c ./base.txt
194200
# -r ./extra-pdf-image.in
@@ -236,7 +242,7 @@ six==1.16.0
236242
# via
237243
# -c ./base.txt
238244
# python-dateutil
239-
sympy==1.13.2
245+
sympy==1.13.3
240246
# via
241247
# onnxruntime
242248
# torch

requirements/huggingface.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ click==8.1.7
1616
# via
1717
# -c ./base.txt
1818
# sacremoses
19-
filelock==3.16.0
19+
filelock==3.16.1
2020
# via
2121
# huggingface-hub
2222
# torch
@@ -25,7 +25,7 @@ fsspec==2024.9.0
2525
# via
2626
# huggingface-hub
2727
# torch
28-
huggingface-hub==0.24.7
28+
huggingface-hub==0.25.0
2929
# via
3030
# tokenizers
3131
# transformers
@@ -82,7 +82,7 @@ six==1.16.0
8282
# via
8383
# -c ./base.txt
8484
# langdetect
85-
sympy==1.13.2
85+
sympy==1.13.3
8686
# via torch
8787
tokenizers==0.19.1
8888
# via

requirements/ingest/airtable.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ inflection==0.5.1
2222
# via pyairtable
2323
pyairtable==2.3.3
2424
# via -r ./ingest/airtable.in
25-
pydantic==2.9.1
25+
pydantic==2.9.2
2626
# via pyairtable
27-
pydantic-core==2.23.3
27+
pydantic-core==2.23.4
2828
# via pydantic
2929
requests==2.32.3
3030
# via

requirements/ingest/astradb.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
#
55
# pip-compile ./ingest/astradb.in
66
#
7-
anyio==4.4.0
7+
anyio==4.5.0
88
# via
99
# -c ./ingest/../base.txt
1010
# httpx
1111
astrapy==1.4.2
1212
# via -r ./ingest/astradb.in
1313
cassandra-driver==3.29.2
1414
# via cassio
15-
cassio==0.1.8
15+
cassio==0.1.9
1616
# via astrapy
1717
certifi==2024.8.30
1818
# via
@@ -70,7 +70,7 @@ packaging==24.1
7070
# via
7171
# -c ./ingest/../base.txt
7272
# deprecation
73-
pymongo==4.8.0
73+
pymongo==4.9.1
7474
# via astrapy
7575
requests==2.32.3
7676
# via

requirements/ingest/azure.txt

+8-6
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@ azure-core==1.31.0
2323
# azure-storage-blob
2424
azure-datalake-store==0.0.53
2525
# via adlfs
26-
azure-identity==1.17.1
26+
azure-identity==1.18.0
2727
# via adlfs
28-
azure-storage-blob==12.22.0
28+
azure-storage-blob==12.23.0
2929
# via adlfs
3030
certifi==2024.8.30
3131
# via
3232
# -c ./ingest/../base.txt
3333
# requests
3434
cffi==1.17.1
3535
# via
36+
# -c ./ingest/../base.txt
3637
# azure-datalake-store
3738
# cryptography
3839
charset-normalizer==3.3.2
@@ -41,6 +42,7 @@ charset-normalizer==3.3.2
4142
# requests
4243
cryptography==43.0.1
4344
# via
45+
# -c ./ingest/../base.txt
4446
# azure-identity
4547
# azure-storage-blob
4648
# msal
@@ -74,11 +76,11 @@ multidict==6.1.0
7476
portalocker==2.10.1
7577
# via msal-extensions
7678
pycparser==2.22
77-
# via cffi
78-
pyjwt[crypto]==2.9.0
7979
# via
80-
# msal
81-
# pyjwt
80+
# -c ./ingest/../base.txt
81+
# cffi
82+
pyjwt[crypto]==2.9.0
83+
# via msal
8284
requests==2.32.3
8385
# via
8486
# -c ./ingest/../base.txt

requirements/ingest/box.txt

+9-3
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,17 @@ certifi==2024.8.30
1515
# -c ./ingest/../base.txt
1616
# requests
1717
cffi==1.17.1
18-
# via cryptography
18+
# via
19+
# -c ./ingest/../base.txt
20+
# cryptography
1921
charset-normalizer==3.3.2
2022
# via
2123
# -c ./ingest/../base.txt
2224
# requests
2325
cryptography==43.0.1
24-
# via boxsdk
26+
# via
27+
# -c ./ingest/../base.txt
28+
# boxsdk
2529
fsspec==2024.9.0
2630
# via
2731
# -r ./ingest/box.in
@@ -31,7 +35,9 @@ idna==3.10
3135
# -c ./ingest/../base.txt
3236
# requests
3337
pycparser==2.22
34-
# via cffi
38+
# via
39+
# -c ./ingest/../base.txt
40+
# cffi
3541
pyjwt==2.9.0
3642
# via boxsdk
3743
python-dateutil==2.9.0.post0

0 commit comments

Comments
 (0)