Skip to content

Commit 83a08e7

Browse files
GitHKAndrei Neagu
andauthored
⬆️ Maintenance: bump all dependencies for dynamic-sidecar service (#6841)
Co-authored-by: Andrei Neagu <[email protected]>
1 parent 125a290 commit 83a08e7

File tree

9 files changed

+182
-151
lines changed

9 files changed

+182
-151
lines changed

services/dynamic-sidecar/requirements/_base.txt

Lines changed: 102 additions & 94 deletions
Large diffs are not rendered by default.

services/dynamic-sidecar/requirements/_test.txt

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
aioboto3==13.1.1
1+
aioboto3==13.2.0
22
# via -r requirements/_test.in
3-
aiobotocore==2.13.1
3+
aiobotocore==2.15.2
44
# via aioboto3
5-
aiofiles==23.2.1
5+
aiofiles==24.1.0
66
# via
77
# -c requirements/_base.txt
88
# aioboto3
9-
aiohttp==3.9.3
9+
aiohappyeyeballs==2.4.3
10+
# via
11+
# -c requirements/_base.txt
12+
# aiohttp
13+
aiohttp==3.11.7
1014
# via
1115
# -c requirements/../../../requirements/constraints.txt
1216
# -c requirements/_base.txt
@@ -21,44 +25,44 @@ asgi-lifespan==2.1.0
2125
# via -r requirements/_test.in
2226
async-asgi-testclient==1.4.11
2327
# via -r requirements/_test.in
24-
attrs==23.2.0
28+
attrs==24.2.0
2529
# via
2630
# -c requirements/_base.txt
2731
# aiohttp
28-
boto3==1.34.131
32+
boto3==1.35.36
2933
# via aiobotocore
30-
botocore==1.34.131
34+
botocore==1.35.36
3135
# via
3236
# aiobotocore
3337
# boto3
3438
# s3transfer
35-
certifi==2024.2.2
39+
certifi==2024.8.30
3640
# via
3741
# -c requirements/../../../requirements/constraints.txt
3842
# -c requirements/_base.txt
3943
# requests
40-
charset-normalizer==3.3.2
44+
charset-normalizer==3.4.0
4145
# via
4246
# -c requirements/_base.txt
4347
# requests
44-
coverage==7.6.1
48+
coverage==7.6.8
4549
# via pytest-cov
4650
docker==7.1.0
4751
# via -r requirements/_test.in
48-
faker==29.0.0
52+
faker==33.0.0
4953
# via -r requirements/_test.in
5054
flaky==3.8.1
5155
# via -r requirements/_test.in
52-
frozenlist==1.4.1
56+
frozenlist==1.5.0
5357
# via
5458
# -c requirements/_base.txt
5559
# aiohttp
5660
# aiosignal
57-
greenlet==3.0.3
61+
greenlet==3.1.1
5862
# via
5963
# -c requirements/_base.txt
6064
# sqlalchemy
61-
idna==3.6
65+
idna==3.10
6266
# via
6367
# -c requirements/_base.txt
6468
# requests
@@ -69,22 +73,27 @@ jmespath==1.0.1
6973
# via
7074
# boto3
7175
# botocore
72-
multidict==6.0.5
76+
multidict==6.1.0
7377
# via
7478
# -c requirements/_base.txt
7579
# aiohttp
7680
# async-asgi-testclient
7781
# yarl
78-
mypy==1.12.0
82+
mypy==1.13.0
7983
# via sqlalchemy
8084
mypy-extensions==1.0.0
8185
# via mypy
82-
packaging==24.0
86+
packaging==24.2
8387
# via
8488
# -c requirements/_base.txt
8589
# pytest
8690
pluggy==1.5.0
8791
# via pytest
92+
propcache==0.2.0
93+
# via
94+
# -c requirements/_base.txt
95+
# aiohttp
96+
# yarl
8897
pytest==8.3.3
8998
# via
9099
# -r requirements/_test.in
@@ -95,7 +104,7 @@ pytest-asyncio==0.23.8
95104
# via
96105
# -c requirements/../../../requirements/constraints.txt
97106
# -r requirements/_test.in
98-
pytest-cov==5.0.0
107+
pytest-cov==6.0.0
99108
# via -r requirements/_test.in
100109
pytest-mock==3.14.0
101110
# via -r requirements/_test.in
@@ -113,7 +122,7 @@ requests==2.32.3
113122
# -c requirements/_base.txt
114123
# async-asgi-testclient
115124
# docker
116-
s3transfer==0.10.2
125+
s3transfer==0.10.4
117126
# via boto3
118127
six==1.16.0
119128
# via
@@ -123,24 +132,25 @@ sniffio==1.3.1
123132
# via
124133
# -c requirements/_base.txt
125134
# asgi-lifespan
126-
sqlalchemy==1.4.52
135+
sqlalchemy==1.4.54
127136
# via
128137
# -c requirements/../../../requirements/constraints.txt
129138
# -c requirements/_base.txt
130139
# -r requirements/_test.in
131140
sqlalchemy2-stubs==0.0.2a38
132141
# via sqlalchemy
133-
types-aiobotocore-s3==2.15.1
142+
types-aiobotocore-s3==2.15.2
134143
# via -r requirements/_test.in
135144
types-aiofiles==24.1.0.20240626
136145
# via -r requirements/_test.in
137-
types-psutil==6.0.0.20240901
146+
types-psutil==6.1.0.20241102
138147
# via -r requirements/_test.in
139148
types-pyyaml==6.0.12.20240917
140149
# via -r requirements/_test.in
141-
typing-extensions==4.11.0
150+
typing-extensions==4.12.2
142151
# via
143152
# -c requirements/_base.txt
153+
# faker
144154
# mypy
145155
# sqlalchemy2-stubs
146156
# types-aiobotocore-s3
@@ -151,11 +161,11 @@ urllib3==2.2.3
151161
# botocore
152162
# docker
153163
# requests
154-
wrapt==1.16.0
164+
wrapt==1.17.0
155165
# via
156166
# -c requirements/_base.txt
157167
# aiobotocore
158-
yarl==1.9.4
168+
yarl==1.18.0
159169
# via
160170
# -c requirements/_base.txt
161171
# aiohttp
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
astroid==3.3.4
1+
astroid==3.3.5
22
# via pylint
3-
black==24.8.0
3+
black==24.10.0
44
# via -r requirements/../../../requirements/devenv.txt
5-
build==1.2.2
5+
build==1.2.2.post1
66
# via pip-tools
77
bump2version==1.0.1
88
# via -r requirements/../../../requirements/devenv.txt
@@ -13,21 +13,21 @@ click==8.1.7
1313
# -c requirements/_base.txt
1414
# black
1515
# pip-tools
16-
dill==0.3.8
16+
dill==0.3.9
1717
# via pylint
18-
distlib==0.3.8
18+
distlib==0.3.9
1919
# via virtualenv
2020
filelock==3.16.1
2121
# via virtualenv
22-
identify==2.6.1
22+
identify==2.6.3
2323
# via pre-commit
2424
isort==5.13.2
2525
# via
2626
# -r requirements/../../../requirements/devenv.txt
2727
# pylint
2828
mccabe==0.7.0
2929
# via pylint
30-
mypy==1.12.0
30+
mypy==1.13.0
3131
# via
3232
# -c requirements/_test.txt
3333
# -r requirements/../../../requirements/devenv.txt
@@ -38,50 +38,49 @@ mypy-extensions==1.0.0
3838
# mypy
3939
nodeenv==1.9.1
4040
# via pre-commit
41-
packaging==24.0
41+
packaging==24.2
4242
# via
4343
# -c requirements/_base.txt
4444
# -c requirements/_test.txt
4545
# black
4646
# build
4747
pathspec==0.12.1
4848
# via black
49-
pip==24.2
49+
pip==24.3.1
5050
# via pip-tools
5151
pip-tools==7.4.1
5252
# via -r requirements/../../../requirements/devenv.txt
5353
platformdirs==4.3.6
5454
# via
55+
# -c requirements/_base.txt
5556
# black
5657
# pylint
5758
# virtualenv
58-
pre-commit==3.8.0
59+
pre-commit==4.0.1
5960
# via -r requirements/../../../requirements/devenv.txt
60-
pylint==3.3.0
61+
pylint==3.3.1
6162
# via -r requirements/../../../requirements/devenv.txt
62-
pyproject-hooks==1.1.0
63+
pyproject-hooks==1.2.0
6364
# via
6465
# build
6566
# pip-tools
66-
pyyaml==6.0.1
67+
pyyaml==6.0.2
6768
# via
6869
# -c requirements/../../../requirements/constraints.txt
6970
# -c requirements/_base.txt
7071
# pre-commit
71-
ruff==0.6.7
72+
ruff==0.8.0
7273
# via -r requirements/../../../requirements/devenv.txt
73-
setuptools==74.0.0
74-
# via
75-
# -c requirements/_base.txt
76-
# pip-tools
74+
setuptools==75.6.0
75+
# via pip-tools
7776
tomlkit==0.13.2
7877
# via pylint
79-
typing-extensions==4.11.0
78+
typing-extensions==4.12.2
8079
# via
8180
# -c requirements/_base.txt
8281
# -c requirements/_test.txt
8382
# mypy
84-
virtualenv==20.26.5
83+
virtualenv==20.28.0
8584
# via pre-commit
86-
wheel==0.44.0
85+
wheel==0.45.1
8786
# via pip-tools

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rest/containers.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,9 @@ async def get_container_logs(
241241
if timestamps:
242242
args["timestamps"] = True
243243

244-
container_logs: list[str] = await container_instance.log(**args)
244+
container_logs: list[str] = await container_instance.log(
245+
**args
246+
) # type:ignore[call-overload]
245247
return container_logs
246248

247249

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/docker_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import logging
22
from collections.abc import AsyncGenerator, Iterable
33
from contextlib import asynccontextmanager
4-
from typing import Any, cast
4+
from typing import Any
55

66
import aiodocker
77
import yaml
@@ -65,7 +65,7 @@ async def _get_container(
6565
docker: aiodocker.Docker, container_name: str
6666
) -> DockerContainer | None:
6767
try:
68-
return cast(DockerContainer, await docker.containers.get(container_name))
68+
return await docker.containers.get(container_name)
6969
except aiodocker.DockerError as e:
7070
if e.status == http_status.HTTP_404_NOT_FOUND:
7171
return None

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/attribute_monitor/_logging_event_handler.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ class _LoggingEventHandler(SafeFileSystemEventHandler):
2727
def event_handler(self, event: FileSystemEvent) -> None:
2828
# NOTE: runs in the created process
2929

30-
file_path = Path(event.src_path)
30+
file_path = Path(
31+
event.src_path.decode()
32+
if isinstance(event.src_path, bytes)
33+
else event.src_path
34+
)
3135
with suppress(FileNotFoundError):
3236
file_stat = file_path.stat()
3337
logger.info(

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/attribute_monitor/_watchdog_extensions.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515

1616

1717
class _ExtendedInotifyBuffer(InotifyBuffer):
18-
def __init__(self, path, recursive=False): # pylint:disable=super-init-not-called
18+
def __init__(
19+
self, path: bytes, *, recursive: bool = False
20+
): # pylint:disable=super-init-not-called
1921
# below call to `BaseThread.__init__` is correct since we want to
2022
# overwrite the `InotifyBuffer.__init__` method
2123
BaseThread.__init__(self) # pylint:disable=non-parent-init-called
2224
self._queue = DelayedQueue(self.delay)
2325
self._inotify = Inotify( # pylint:disable=too-many-function-args
24-
path, recursive, InotifyConstants.IN_ATTRIB
26+
path, recursive=recursive, event_mask=InotifyConstants.IN_ATTRIB
2527
)
2628
self.start()
2729

@@ -30,7 +32,7 @@ class _ExtendedInotifyEmitter(InotifyEmitter):
3032
def on_thread_start(self):
3133
path = os.fsencode(self.watch.path)
3234
# pylint:disable=attribute-defined-outside-init
33-
self._inotify = _ExtendedInotifyBuffer(path, self.watch.is_recursive)
35+
self._inotify = _ExtendedInotifyBuffer(path, recursive=self.watch.is_recursive)
3436

3537

3638
class ExtendedInotifyObserver(BaseObserver):

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/outputs/_event_handler.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ def event_handler(self, event: FileSystemEvent) -> None:
4949
# NOTE: ignoring all events which are not relative to modifying
5050
# the contents of the `port_key` folders from the outputs directory
5151

52-
path_relative_to_outputs = Path(event.src_path).relative_to(self.outputs_path)
52+
path_relative_to_outputs = Path(
53+
event.src_path.decode()
54+
if isinstance(event.src_path, bytes)
55+
else event.src_path
56+
).relative_to(self.outputs_path)
5357

5458
# discard event if not part of a subfolder
5559
relative_path_parents = path_relative_to_outputs.parents

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/outputs/_watchdog_extensions.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,15 @@
3131

3232

3333
class _ExtendedInotifyBuffer(InotifyBuffer):
34-
def __init__(self, path, recursive=False): # pylint:disable=super-init-not-called
34+
def __init__(
35+
self, path: bytes, *, recursive: bool = False
36+
): # pylint:disable=super-init-not-called
3537
# below call to `BaseThread.__init__` is correct since we want to
3638
# overwrite the `InotifyBuffer.__init__` method
3739
BaseThread.__init__(self) # pylint:disable=non-parent-init-called
3840
self._queue = DelayedQueue(self.delay)
3941
self._inotify = Inotify( # pylint:disable=too-many-function-args
40-
path, recursive, _EVENTS_TO_WATCH
42+
path, recursive=recursive, event_mask=_EVENTS_TO_WATCH
4143
)
4244
self.start()
4345

@@ -46,7 +48,7 @@ class _ExtendedInotifyEmitter(InotifyEmitter):
4648
def on_thread_start(self):
4749
path = os.fsencode(self.watch.path)
4850
# pylint:disable=attribute-defined-outside-init
49-
self._inotify = _ExtendedInotifyBuffer(path, self.watch.is_recursive)
51+
self._inotify = _ExtendedInotifyBuffer(path, recursive=self.watch.is_recursive)
5052

5153

5254
class ExtendedInotifyObserver(BaseObserver):

0 commit comments

Comments
 (0)