Skip to content

Commit 6a57852

Browse files
sandereggsanderegg
authored
✨ Dask scheduler to allow the dask-gateway to control it (ITISFoundation#2747)
1 parent 1187034 commit 6a57852

File tree

8 files changed

+40
-35
lines changed

8 files changed

+40
-35
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ cloudpickle==2.0.0
1010
# via
1111
# dask
1212
# distributed
13-
dask==2021.11.2
13+
dask==2021.12.0
1414
# via
1515
# -r requirements/_base.in
1616
# distributed
17-
distributed==2021.11.2
17+
distributed==2021.12.0
1818
# via dask
1919
dnspython==2.1.0
2020
# via email-validator

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ fi
3434
#
3535

3636
if [ ${DASK_START_AS_SCHEDULER+x} ]; then
37-
SCHEDULER_VERSION=$(dask-scheduler --version)
38-
39-
echo "$INFO" "Starting as ${SCHEDULER_VERSION}..."
37+
scheduler_version=$(dask-scheduler --version)
38+
echo "$INFO" "Starting as dask-scheduler:${scheduler_version}..."
4039
if [ "${SC_BOOT_MODE}" = "debug-ptvsd" ]; then
41-
42-
exec watchmedo auto-restart --recursive --pattern="*.py;*/src/*" --ignore-patterns="*test*;pytest_simcore/*;setup.py;*ignore*" --ignore-directories -- \
40+
exec watchmedo auto-restart \
41+
--recursive \
42+
--pattern="*.py;*/src/*" \
43+
--ignore-patterns="*test*;pytest_simcore/*;setup.py;*ignore*" \
44+
--ignore-directories -- \
4345
dask-scheduler
44-
4546
else
46-
4747
exec dask-scheduler
48-
4948
fi
49+
5050
else
5151
DASK_WORKER_VERSION=$(dask-worker --version)
5252
DASK_SCHEDULER_URL=${DASK_SCHEDULER_URL:="tcp://${DASK_SCHEDULER_HOST}:8786"}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ aiofiles
2222
aiohttp
2323
requests
2424
dask[complete]
25+
dask-gateway
2526
pydantic[email,dotenv]
2627

2728
# compression

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

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ aiohttp==3.8.1
2020
# -c requirements/../../../requirements/constraints.txt
2121
# -r requirements/_base.in
2222
# aiodocker
23+
# dask-gateway
2324
# jupyter-server-proxy
2425
aiosignal==1.2.0
2526
# via aiohttp
@@ -40,7 +41,7 @@ bleach==3.3.0
4041
# via nbconvert
4142
blosc==1.10.4
4243
# via -r requirements/_base.in
43-
bokeh==2.3.2
44+
bokeh==2.4.2
4445
# via dask
4546
certifi==2021.5.30
4647
# via requests
@@ -52,21 +53,26 @@ charset-normalizer==2.0.6
5253
# requests
5354
click==7.1.2
5455
# via distributed
55-
cloudpickle==1.6.0
56+
cloudpickle==2.0.0
5657
# via
5758
# dask
5859
# distributed
5960
cytoolz==0.11.0
6061
# via -r requirements/_base.in
61-
dask==2021.10.0
62+
dask==2021.12.0
6263
# via
6364
# -c requirements/../../../packages/dask-task-models-library/requirements/_base.in
6465
# -r requirements/_base.in
66+
# dask-gateway
6567
# distributed
68+
dask-gateway==0.9.0
69+
# via -r requirements/_base.in
6670
defusedxml==0.7.1
6771
# via nbconvert
68-
distributed==2021.10.0
69-
# via dask
72+
distributed==2021.12.0
73+
# via
74+
# dask
75+
# dask-gateway
7076
dnspython==2.0.0
7177
# via email-validator
7278
email-validator==1.1.1
@@ -77,7 +83,7 @@ frozenlist==1.2.0
7783
# via
7884
# aiohttp
7985
# aiosignal
80-
fsspec==2021.10.1
86+
fsspec==2022.1.0
8187
# via
8288
# -c requirements/constraints.txt
8389
# dask
@@ -210,7 +216,6 @@ pyrsistent==0.17.3
210216
# via jsonschema
211217
python-dateutil==2.8.1
212218
# via
213-
# bokeh
214219
# jupyter-client
215220
# pandas
216221
python-dotenv==0.19.0

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@
44
#
55
# pip-compile --output-file=requirements/_dask-complete.txt --strip-extras requirements/_dask-complete.in
66
#
7-
bokeh==2.3.2
7+
bokeh==2.4.2
88
# via
99
# -c requirements/./_base.txt
1010
# dask
1111
click==7.1.2
1212
# via
1313
# -c requirements/./_base.txt
1414
# distributed
15-
cloudpickle==1.6.0
15+
cloudpickle==2.0.0
1616
# via
1717
# -c requirements/./_base.txt
1818
# dask
1919
# distributed
20-
dask==2021.10.0
20+
dask==2021.12.0
2121
# via
2222
# -c requirements/./_base.txt
2323
# -r requirements/_dask-complete.in
2424
# distributed
25-
distributed==2021.10.0
25+
distributed==2021.12.0
2626
# via
2727
# -c requirements/./_base.txt
2828
# dask
29-
fsspec==2021.10.1
29+
fsspec==2022.1.0
3030
# via
3131
# -c requirements/./_base.txt
3232
# dask
@@ -86,7 +86,6 @@ pyparsing==2.4.7
8686
python-dateutil==2.8.1
8787
# via
8888
# -c requirements/./_base.txt
89-
# bokeh
9089
# pandas
9190
pytz==2020.1
9291
# via

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ click==7.1.2
88
# via
99
# -c requirements/./_base.txt
1010
# distributed
11-
cloudpickle==1.6.0
11+
cloudpickle==2.0.0
1212
# via
1313
# -c requirements/./_base.txt
1414
# dask
1515
# distributed
16-
dask==2021.10.0
16+
dask==2021.12.0
1717
# via
1818
# -c requirements/./_base.txt
1919
# -r requirements/_dask-distributed.in
2020
# distributed
21-
distributed==2021.10.0
21+
distributed==2021.12.0
2222
# via
2323
# -c requirements/./_base.txt
2424
# dask
25-
fsspec==2021.10.1
25+
fsspec==2022.1.0
2626
# via
2727
# -c requirements/./_base.txt
2828
# dask

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ click==7.1.2
1414
# via
1515
# -c requirements/_base.txt
1616
# distributed
17-
cloudpickle==1.6.0
17+
cloudpickle==2.0.0
1818
# via
1919
# -c requirements/_base.txt
2020
# dask
2121
# distributed
22-
dask==2021.10.0
22+
dask==2021.12.0
2323
# via
2424
# -c requirements/_base.txt
2525
# -r requirements/../../../packages/dask-task-models-library/requirements/_base.in
2626
# distributed
27-
distributed==2021.10.0
27+
distributed==2021.12.0
2828
# via
2929
# -c requirements/_base.txt
3030
# dask
@@ -36,7 +36,7 @@ email-validator==1.1.1
3636
# via
3737
# -c requirements/_base.txt
3838
# pydantic
39-
fsspec==2021.10.1
39+
fsspec==2022.1.0
4040
# via
4141
# -c requirements/_base.txt
4242
# dask

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ click==7.1.2
7979
# distributed
8080
# typer
8181
# uvicorn
82-
cloudpickle==1.6.0
82+
cloudpickle==2.0.0
8383
# via
8484
# -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
8585
# dask
8686
# distributed
87-
dask==2021.10.0
87+
dask==2021.12.0
8888
# via
8989
# -r requirements/../../../packages/dask-task-models-library/requirements/_base.in
9090
# -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
@@ -94,7 +94,7 @@ dask-gateway==0.9.0
9494
# via -r requirements/_base.in
9595
decorator==4.4.2
9696
# via networkx
97-
distributed==2021.10.0
97+
distributed==2021.12.0
9898
# via
9999
# -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
100100
# dask
@@ -112,7 +112,7 @@ fastapi==0.71.0
112112
# fastapi-contrib
113113
fastapi-contrib==0.2.11
114114
# via -r requirements/../../../packages/service-library/requirements/_fastapi.in
115-
fsspec==2021.10.1
115+
fsspec==2022.1.0
116116
# via
117117
# -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
118118
# dask

0 commit comments

Comments
 (0)