Skip to content

Commit f4df405

Browse files
sandereggsanderegg
authored
⬆️ Maintenance: upgrade dask libraries (ITISFoundation#3135)
1 parent 38add68 commit f4df405

File tree

11 files changed

+76
-52
lines changed

11 files changed

+76
-52
lines changed

‎.github/workflows/ci-testing-deploy.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ on:
1414
- "!.vscode/**"
1515
- "**.py"
1616
- "**.js"
17+
- "**/requirements/*.txt"
18+
- "**.json"
1719
- ".github/workflows/ci-testing-deploy.yml"
1820
pull_request:
1921
branches:
@@ -27,6 +29,8 @@ on:
2729
- "!.vscode-template/**"
2830
- "**.py"
2931
- "**.js"
32+
- "**/requirements/*.txt"
33+
- "**.json"
3034
- ".github/workflows/ci-testing-deploy.yml"
3135

3236
env:

‎packages/dask-task-models-library/requirements/_base.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ cloudpickle==2.0.0
1212
# via
1313
# dask
1414
# distributed
15-
dask==2022.05.0
15+
dask==2022.6.0
1616
# via
1717
# -r requirements/_base.in
1818
# distributed
19-
distributed==2022.05.0
19+
distributed==2022.6.0
2020
# via dask
2121
dnspython==2.2.1
2222
# via email-validator
2323
email-validator==1.2.1
2424
# via pydantic
25-
fsspec==2022.3.0
25+
fsspec==2022.5.0
2626
# via dask
2727
heapdict==1.0.1
2828
# via zict

‎services/dask-sidecar/docker/boot.sh‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,7 @@ else
111111
dask-worker "${DASK_SCHEDULER_URL}" \
112112
--local-directory /tmp/dask-sidecar \
113113
--preload simcore_service_dask_sidecar.tasks \
114-
--reconnect \
115-
--no-nanny \
116-
--nprocs ${DASK_NPROCS} \
114+
--nworkers ${DASK_NPROCS} \
117115
--nthreads "${DASK_NTHREADS}" \
118116
--dashboard-address 8787 \
119117
--memory-limit "${DASK_MEMORY_LIMIT}" \
@@ -123,9 +121,7 @@ else
123121
exec dask-worker "${DASK_SCHEDULER_URL}" \
124122
--local-directory /tmp/dask-sidecar \
125123
--preload simcore_service_dask_sidecar.tasks \
126-
--reconnect \
127-
--no-nanny \
128-
--nprocs ${DASK_NPROCS} \
124+
--nworkers ${DASK_NPROCS} \
129125
--nthreads "${DASK_NTHREADS}" \
130126
--dashboard-address 8787 \
131127
--memory-limit "${DASK_MEMORY_LIMIT}" \

‎services/dask-sidecar/requirements/_base.txt‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in
66
#
7-
aiobotocore==2.2.0
7+
aiobotocore==2.3.3
88
# via s3fs
99
aiodocker==0.21.0
1010
# via -r requirements/_base.in
@@ -49,7 +49,7 @@ bleach==3.3.0
4949
# via nbconvert
5050
blosc==1.10.6
5151
# via -r requirements/_base.in
52-
bokeh==2.4.2
52+
bokeh==2.4.3
5353
# via dask
5454
botocore==1.24.21
5555
# via aiobotocore
@@ -62,24 +62,26 @@ charset-normalizer==2.0.12
6262
# aiohttp
6363
# requests
6464
click==8.1.3
65-
# via distributed
65+
# via
66+
# dask-gateway
67+
# distributed
6668
cloudpickle==2.0.0
6769
# via
6870
# dask
6971
# distributed
7072
cytoolz==0.11.0
7173
# via -r requirements/_base.in
72-
dask==2022.4.0
74+
dask==2022.6.0
7375
# via
7476
# -c requirements/../../../packages/dask-task-models-library/requirements/_base.in
7577
# -r requirements/_base.in
7678
# dask-gateway
7779
# distributed
78-
dask-gateway==0.9.0
80+
dask-gateway==2022.6.1
7981
# via -r requirements/_base.in
8082
defusedxml==0.7.1
8183
# via nbconvert
82-
distributed==2022.4.0
84+
distributed==2022.6.0
8385
# via
8486
# dask
8587
# dask-gateway
@@ -95,7 +97,7 @@ frozenlist==1.3.0
9597
# via
9698
# aiohttp
9799
# aiosignal
98-
fsspec==2022.3.0
100+
fsspec==2022.5.0
99101
# via
100102
# -c requirements/constraints.txt
101103
# dask
@@ -146,8 +148,10 @@ jupyter-server-proxy==3.2.1
146148
# via -r requirements/_base.in
147149
jupyterlab-pygments==0.1.2
148150
# via nbconvert
149-
locket==0.2.1
150-
# via partd
151+
locket==1.0.0
152+
# via
153+
# distributed
154+
# partd
151155
lz4==4.0.0
152156
# via -r requirements/_base.in
153157
markupsafe==2.1.1
@@ -247,14 +251,15 @@ pyyaml==5.4.1
247251
# -c requirements/../../../requirements/constraints.txt
248252
# bokeh
249253
# dask
254+
# dask-gateway
250255
# distributed
251256
pyzmq==22.1.0
252257
# via
253258
# jupyter-client
254259
# jupyter-server
255260
requests==2.27.1
256261
# via -r requirements/_base.in
257-
s3fs==2022.3.0
262+
s3fs==2022.5.0
258263
# via -r requirements/_base.in
259264
send2trash==1.7.1
260265
# via jupyter-server
@@ -288,6 +293,7 @@ toolz==0.11.1
288293
tornado==6.1
289294
# via
290295
# bokeh
296+
# dask-gateway
291297
# distributed
292298
# jupyter-client
293299
# jupyter-server

‎services/dask-sidecar/requirements/_dask-complete.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ blosc==1.10.6
88
# via
99
# -c requirements/./_base.txt
1010
# -r requirements/_dask-complete.in
11-
bokeh==2.4.2
11+
bokeh==2.4.3
1212
# via
1313
# -c requirements/./_base.txt
1414
# dask
@@ -21,16 +21,16 @@ cloudpickle==2.0.0
2121
# -c requirements/./_base.txt
2222
# dask
2323
# distributed
24-
dask==2022.4.0
24+
dask==2022.6.0
2525
# via
2626
# -c requirements/./_base.txt
2727
# -r requirements/_dask-complete.in
2828
# distributed
29-
distributed==2022.4.0
29+
distributed==2022.6.0
3030
# via
3131
# -c requirements/./_base.txt
3232
# dask
33-
fsspec==2022.3.0
33+
fsspec==2022.5.0
3434
# via
3535
# -c requirements/./_base.txt
3636
# dask
@@ -44,9 +44,10 @@ jinja2==2.11.3
4444
# bokeh
4545
# dask
4646
# distributed
47-
locket==0.2.1
47+
locket==1.0.0
4848
# via
4949
# -c requirements/./_base.txt
50+
# distributed
5051
# partd
5152
lz4==4.0.0
5253
# via

‎services/dask-sidecar/requirements/_dask-distributed.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ cloudpickle==2.0.0
1717
# -c requirements/./_base.txt
1818
# dask
1919
# distributed
20-
dask==2022.4.0
20+
dask==2022.6.0
2121
# via
2222
# -c requirements/./_base.txt
2323
# -r requirements/_dask-distributed.in
2424
# distributed
25-
distributed==2022.4.0
25+
distributed==2022.6.0
2626
# via
2727
# -c requirements/./_base.txt
2828
# dask
29-
fsspec==2022.3.0
29+
fsspec==2022.5.0
3030
# via
3131
# -c requirements/./_base.txt
3232
# dask
@@ -38,9 +38,10 @@ jinja2==2.11.3
3838
# via
3939
# -c requirements/./_base.txt
4040
# distributed
41-
locket==0.2.1
41+
locket==1.0.0
4242
# via
4343
# -c requirements/./_base.txt
44+
# distributed
4445
# partd
4546
lz4==4.0.0
4647
# via

‎services/dask-sidecar/requirements/_packages.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ cloudpickle==2.0.0
2424
# -c requirements/_base.txt
2525
# dask
2626
# distributed
27-
dask==2022.4.0
27+
dask==2022.6.0
2828
# via
2929
# -c requirements/_base.txt
3030
# -r requirements/../../../packages/dask-task-models-library/requirements/_base.in
3131
# distributed
32-
distributed==2022.4.0
32+
distributed==2022.6.0
3333
# via
3434
# -c requirements/_base.txt
3535
# dask
@@ -41,7 +41,7 @@ email-validator==1.2.1
4141
# via
4242
# -c requirements/_base.txt
4343
# pydantic
44-
fsspec==2022.3.0
44+
fsspec==2022.5.0
4545
# via
4646
# -c requirements/_base.txt
4747
# dask
@@ -68,9 +68,10 @@ jsonschema==3.2.0
6868
# -c requirements/_base.txt
6969
# -r requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/_base.in
7070
# -r requirements/../../../packages/models-library/requirements/_base.in
71-
locket==0.2.1
71+
locket==1.0.0
7272
# via
7373
# -c requirements/_base.txt
74+
# distributed
7475
# partd
7576
markupsafe==2.1.1
7677
# via

‎services/director-v2/requirements/_base.txt‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ charset-normalizer==2.0.12
8888
click==8.1.3
8989
# via
9090
# -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
91+
# dask-gateway
9192
# distributed
9293
# typer
9394
# uvicorn
@@ -96,17 +97,17 @@ cloudpickle==2.0.0
9697
# -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
9798
# dask
9899
# distributed
99-
dask==2022.4.0
100+
dask==2022.6.0
100101
# via
101102
# -r requirements/../../../packages/dask-task-models-library/requirements/_base.in
102103
# -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
103104
# dask-gateway
104105
# distributed
105-
dask-gateway==0.9.0
106+
dask-gateway==2022.6.1
106107
# via -r requirements/_base.in
107108
decorator==4.4.2
108109
# via networkx
109-
distributed==2022.4.0
110+
distributed==2022.6.0
110111
# via
111112
# -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
112113
# dask
@@ -128,7 +129,7 @@ frozenlist==1.3.0
128129
# via
129130
# aiohttp
130131
# aiosignal
131-
fsspec==2022.3.0
132+
fsspec==2022.5.0
132133
# via
133134
# -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
134135
# dask
@@ -199,9 +200,10 @@ jsonschema==3.2.0
199200
# -r requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/_base.in
200201
# -r requirements/../../../packages/models-library/requirements/_base.in
201202
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/_base.in
202-
locket==0.2.1
203+
locket==1.0.0
203204
# via
204205
# -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
206+
# distributed
205207
# partd
206208
lz4==4.0.0
207209
# via -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
@@ -320,6 +322,7 @@ pyyaml==5.4.1
320322
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
321323
# -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
322324
# dask
325+
# dask-gateway
323326
# distributed
324327
# fastapi
325328
# uvicorn
@@ -386,6 +389,7 @@ toolz==0.11.1
386389
tornado==6.1
387390
# via
388391
# -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
392+
# dask-gateway
389393
# distributed
390394
# jaeger-client
391395
# threadloop

‎services/director-v2/requirements/_test.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ cryptography==37.0.2
9898
# -c requirements/../../../requirements/constraints.txt
9999
# dask-gateway-server
100100
# paramiko
101-
dask-gateway-server==2022.4.0
101+
dask-gateway-server==2022.6.1
102102
# via -r requirements/_test.in
103103
dill==0.3.4
104104
# via pylint
@@ -331,7 +331,7 @@ tornado==6.1
331331
# via
332332
# -c requirements/_base.txt
333333
# bokeh
334-
traitlets==5.1.1
334+
traitlets==5.3.0
335335
# via dask-gateway-server
336336
typing-extensions==4.2.0
337337
# via

0 commit comments

Comments
 (0)