Skip to content

Commit b10367e

Browse files
authored
[hailctl] Upgrade dataproc to image version 2.2.64 (#15077)
Also update the dataproc requirements to match the version they are actually running. ## Security Assessment - This change cannot impact the Hail Batch instance as deployed by Broad Institute in GCP
1 parent 5dd3bea commit b10367e

File tree

7 files changed

+57
-57
lines changed

7 files changed

+57
-57
lines changed

ci/pinned-requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ certifi==2025.8.3
66
# -c ci/../hail/python/dev/pinned-requirements.txt
77
# -c ci/../hail/python/pinned-requirements.txt
88
# requests
9-
cffi==1.17.1
9+
cffi==2.0.0
1010
# via
1111
# -c ci/../hail/python/dev/pinned-requirements.txt
1212
# -c ci/../hail/python/pinned-requirements.txt
@@ -22,7 +22,7 @@ click==8.2.1
2222
# -c ci/../hail/python/dev/pinned-requirements.txt
2323
# -c ci/../hail/python/pinned-requirements.txt
2424
# zulip
25-
cryptography==45.0.6
25+
cryptography==45.0.7
2626
# via
2727
# -c ci/../hail/python/pinned-requirements.txt
2828
# pyjwt
@@ -37,7 +37,7 @@ idna==3.10
3737
# -c ci/../hail/python/pinned-requirements.txt
3838
# -c ci/../web_common/pinned-requirements.txt
3939
# requests
40-
pycparser==2.22
40+
pycparser==2.23
4141
# via
4242
# -c ci/../hail/python/dev/pinned-requirements.txt
4343
# -c ci/../hail/python/pinned-requirements.txt

gear/pinned-requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ frozenlist==1.7.0
6262
# aiosignal
6363
google-api-core==2.25.1
6464
# via google-api-python-client
65-
google-api-python-client==2.179.0
65+
google-api-python-client==2.181.0
6666
# via google-cloud-profiler
6767
google-auth==2.40.3
6868
# via
@@ -80,7 +80,7 @@ google-cloud-profiler==4.1.0
8080
# via -r gear/requirements.txt
8181
googleapis-common-protos==1.70.0
8282
# via google-api-core
83-
httplib2==0.22.0
83+
httplib2==0.31.0
8484
# via
8585
# google-api-python-client
8686
# google-auth-httplib2
@@ -116,7 +116,7 @@ propcache==0.3.2
116116
# yarl
117117
proto-plus==1.26.1
118118
# via google-api-core
119-
protobuf==6.32.0
119+
protobuf==6.32.1
120120
# via
121121
# google-api-core
122122
# google-cloud-profiler
@@ -137,7 +137,7 @@ pymysql==1.1.2
137137
# via
138138
# -r gear/requirements.txt
139139
# aiomysql
140-
pyparsing==3.2.3
140+
pyparsing==3.2.4
141141
# via
142142
# -c gear/../hail/python/dev/pinned-requirements.txt
143143
# httplib2
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# https://cloud.google.com/dataproc/docs/concepts/versioning/dataproc-release-2.2
22
#
3-
# 2.2.5-debian12
4-
pyspark==3.5.0
3+
# 2.2.64-debian12
4+
pyspark==3.5.3

hail/python/dev/pinned-requirements.txt

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ certifi==2025.8.3
6464
# httpcore
6565
# httpx
6666
# requests
67-
cffi==1.17.1
67+
cffi==2.0.0
6868
# via
6969
# -c hail/python/dev/../pinned-requirements.txt
7070
# argon2-cffi-bindings
@@ -122,15 +122,15 @@ exceptiongroup==1.3.0
122122
# pytest
123123
execnet==2.1.1
124124
# via pytest-xdist
125-
executing==2.2.0
125+
executing==2.2.1
126126
# via
127127
# devtools
128128
# stack-data
129129
fastjsonschema==2.21.2
130130
# via nbformat
131131
filelock==3.19.1
132132
# via virtualenv
133-
fonttools==4.59.1
133+
fonttools==4.59.2
134134
# via matplotlib
135135
fqdn==1.5.1
136136
# via jsonschema
@@ -147,7 +147,7 @@ httpcore==1.0.9
147147
# via httpx
148148
httpx==0.28.1
149149
# via jupyterlab
150-
identify==2.6.13
150+
identify==2.6.14
151151
# via pre-commit
152152
idna==3.10
153153
# via
@@ -206,7 +206,7 @@ jsonschema==4.25.1
206206
# jupyter-events
207207
# jupyterlab-server
208208
# nbformat
209-
jsonschema-specifications==2025.4.1
209+
jsonschema-specifications==2025.9.1
210210
# via jsonschema
211211
jupyter==1.1.1
212212
# via -r hail/python/dev/requirements.txt
@@ -232,7 +232,7 @@ jupyter-core==5.8.1
232232
# notebook
233233
jupyter-events==0.12.0
234234
# via jupyter-server
235-
jupyter-lsp==2.2.6
235+
jupyter-lsp==2.3.0
236236
# via jupyterlab
237237
jupyter-server==2.17.0
238238
# via
@@ -242,7 +242,7 @@ jupyter-server==2.17.0
242242
# notebook-shim
243243
jupyter-server-terminals==0.5.3
244244
# via jupyter-server
245-
jupyterlab==4.4.6
245+
jupyterlab==4.4.7
246246
# via jupyter
247247
jupyterlab-pygments==0.3.0
248248
# via nbconvert
@@ -259,15 +259,15 @@ markupsafe==3.0.2
259259
# -c hail/python/dev/../pinned-requirements.txt
260260
# jinja2
261261
# nbconvert
262-
matplotlib==3.10.5
262+
matplotlib==3.10.6
263263
# via -r hail/python/dev/requirements.txt
264264
matplotlib-inline==0.1.7
265265
# via
266266
# ipykernel
267267
# ipython
268268
mccabe==0.7.0
269269
# via pylint
270-
mistune==3.1.3
270+
mistune==3.1.4
271271
# via nbconvert
272272
mock==5.1.0
273273
# via -r hail/python/dev/requirements.txt
@@ -276,7 +276,7 @@ multidict==6.6.4
276276
# -c hail/python/dev/../pinned-requirements.txt
277277
# aiohttp
278278
# yarl
279-
nbclassic==1.3.1
279+
nbclassic==1.3.2
280280
# via notebook
281281
nbclient==0.10.2
282282
# via nbconvert
@@ -307,7 +307,7 @@ nodeenv==1.9.1
307307
# via
308308
# pre-commit
309309
# pyright
310-
nodejs-wheel-binaries==22.18.0
310+
nodejs-wheel-binaries==22.19.0
311311
# via pyright
312312
notebook==6.5.7
313313
# via
@@ -352,7 +352,7 @@ pillow==11.3.0
352352
# -c hail/python/dev/../pinned-requirements.txt
353353
# -r hail/python/dev/requirements.txt
354354
# matplotlib
355-
platformdirs==4.3.8
355+
platformdirs==4.4.0
356356
# via
357357
# jupyter-core
358358
# pylint
@@ -365,7 +365,7 @@ prometheus-client==0.22.1
365365
# via
366366
# jupyter-server
367367
# notebook
368-
prompt-toolkit==3.0.51
368+
prompt-toolkit==3.0.52
369369
# via
370370
# ipython
371371
# jupyter-console
@@ -384,7 +384,7 @@ pure-eval==0.2.3
384384
# via stack-data
385385
py==1.11.0
386386
# via pytest-forked
387-
pycparser==2.22
387+
pycparser==2.23
388388
# via
389389
# -c hail/python/dev/../pinned-requirements.txt
390390
# cffi
@@ -399,11 +399,11 @@ pygments==2.19.2
399399
# sphinx
400400
pylint==3.3.8
401401
# via -r hail/python/dev/requirements.txt
402-
pyparsing==3.2.3
402+
pyparsing==3.2.4
403403
# via matplotlib
404404
pyproject-hooks==1.2.0
405405
# via build
406-
pyright==1.1.404
406+
pyright==1.1.405
407407
# via -r hail/python/dev/requirements.txt
408408
pytest==7.4.4
409409
# via
@@ -426,7 +426,7 @@ pytest-instafail==0.5.0
426426
# via -r hail/python/dev/requirements.txt
427427
pytest-metadata==3.1.1
428428
# via pytest-html
429-
pytest-mock==3.14.1
429+
pytest-mock==3.15.0
430430
# via -r hail/python/dev/requirements.txt
431431
pytest-timeout==2.4.0
432432
# via -r hail/python/dev/requirements.txt
@@ -449,7 +449,7 @@ pyyaml==6.0.2
449449
# -c hail/python/dev/../pinned-requirements.txt
450450
# jupyter-events
451451
# pre-commit
452-
pyzmq==27.0.2
452+
pyzmq==27.1.0
453453
# via
454454
# ipykernel
455455
# jupyter-client
@@ -476,7 +476,7 @@ rfc3986-validator==0.1.1
476476
# jupyter-events
477477
rfc3987-syntax==1.1.0
478478
# via jsonschema
479-
rpds-py==0.27.0
479+
rpds-py==0.27.1
480480
# via
481481
# jsonschema
482482
# referencing
@@ -498,7 +498,7 @@ sniffio==1.3.1
498498
# via anyio
499499
snowballstemmer==3.0.1
500500
# via sphinx
501-
soupsieve==2.7
501+
soupsieve==2.8
502502
# via beautifulsoup4
503503
sphinx==6.2.1
504504
# via
@@ -579,13 +579,13 @@ types-decorator==5.2.0.20250324
579579
# via -r hail/python/dev/requirements.txt
580580
types-deprecated==1.2.15.20250304
581581
# via -r hail/python/dev/requirements.txt
582-
types-pymysql==1.1.0.20250822
582+
types-pymysql==1.1.0.20250914
583583
# via -r hail/python/dev/requirements.txt
584584
types-python-dateutil==2.9.0.20250822
585585
# via
586586
# -r hail/python/dev/requirements.txt
587587
# arrow
588-
types-pyyaml==6.0.12.20250822
588+
types-pyyaml==6.0.12.20250915
589589
# via -r hail/python/dev/requirements.txt
590590
types-requests==2.31.0.6
591591
# via -r hail/python/dev/requirements.txt
@@ -620,7 +620,7 @@ urllib3==2.5.0
620620
# via
621621
# -c hail/python/dev/../pinned-requirements.txt
622622
# requests
623-
uv==0.8.13
623+
uv==0.8.17
624624
# via -r hail/python/dev/requirements.txt
625625
uv-build==0.8.13
626626
# via -r hail/python/dev/requirements.txt

hail/python/hailtop/hailctl/dataproc/start.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ class VepVersion(str, Enum):
129129

130130
ANNOTATION_DB_BUCKETS = ["hail-datasets-us-central1", "hail-datasets-europe-west1"]
131131

132-
IMAGE_VERSION = '2.2.60-debian12'
132+
IMAGE_VERSION = '2.2.64-debian12'
133133

134134

135135
def start(

hail/python/hailtop/pinned-requirements.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ attrs==25.3.0
1414
# via aiohttp
1515
azure-common==1.1.28
1616
# via azure-mgmt-storage
17-
azure-core==1.35.0
17+
azure-core==1.35.1
1818
# via
1919
# azure-identity
2020
# azure-mgmt-core
2121
# azure-storage-blob
2222
# msrest
23-
azure-identity==1.24.0
23+
azure-identity==1.25.0
2424
# via -r hail/python/hailtop/requirements.txt
2525
azure-mgmt-core==1.6.0
2626
# via azure-mgmt-storage
2727
azure-mgmt-storage==20.1.0
2828
# via -r hail/python/hailtop/requirements.txt
2929
azure-storage-blob==12.26.0
3030
# via -r hail/python/hailtop/requirements.txt
31-
boto3==1.40.16
31+
boto3==1.40.30
3232
# via -r hail/python/hailtop/requirements.txt
33-
botocore==1.40.16
33+
botocore==1.40.30
3434
# via
3535
# -r hail/python/hailtop/requirements.txt
3636
# boto3
@@ -41,7 +41,7 @@ certifi==2025.8.3
4141
# via
4242
# msrest
4343
# requests
44-
cffi==1.17.1
44+
cffi==2.0.0
4545
# via
4646
# cryptography
4747
# pycares
@@ -51,7 +51,7 @@ click==8.2.1
5151
# via typer
5252
commonmark==0.9.1
5353
# via rich
54-
cryptography==45.0.6
54+
cryptography==45.0.7
5555
# via
5656
# azure-identity
5757
# azure-storage-blob
@@ -104,7 +104,7 @@ nest-asyncio==1.6.0
104104
# via -r hail/python/hailtop/requirements.txt
105105
oauthlib==3.3.1
106106
# via requests-oauthlib
107-
orjson==3.11.2
107+
orjson==3.11.3
108108
# via -r hail/python/hailtop/requirements.txt
109109
propcache==0.3.2
110110
# via
@@ -116,9 +116,9 @@ pyasn1==0.6.1
116116
# rsa
117117
pyasn1-modules==0.4.2
118118
# via google-auth
119-
pycares==4.10.0
119+
pycares==4.11.0
120120
# via aiodns
121-
pycparser==2.22
121+
pycparser==2.23
122122
# via cffi
123123
pygments==2.19.2
124124
# via rich
@@ -146,7 +146,7 @@ rich==12.6.0
146146
# typer
147147
rsa==4.9.1
148148
# via google-auth
149-
s3transfer==0.13.1
149+
s3transfer==0.14.0
150150
# via boto3
151151
shellingham==1.5.4
152152
# via typer
@@ -159,7 +159,7 @@ sortedcontainers==2.4.0
159159
# via -r hail/python/hailtop/requirements.txt
160160
tabulate==0.9.0
161161
# via -r hail/python/hailtop/requirements.txt
162-
typer==0.16.1
162+
typer==0.17.4
163163
# via -r hail/python/hailtop/requirements.txt
164164
typing-extensions==4.15.0
165165
# via

0 commit comments

Comments
 (0)