Skip to content

Commit

Permalink
⬆️ Maintenance: bump all dependencies for dynamic-sidecar service (#…
Browse files Browse the repository at this point in the history
…6841)

Co-authored-by: Andrei Neagu <[email protected]>
  • Loading branch information
GitHK and Andrei Neagu authored Nov 27, 2024
1 parent 125a290 commit 83a08e7
Show file tree
Hide file tree
Showing 9 changed files with 182 additions and 151 deletions.
196 changes: 102 additions & 94 deletions services/dynamic-sidecar/requirements/_base.txt

Large diffs are not rendered by default.

60 changes: 35 additions & 25 deletions services/dynamic-sidecar/requirements/_test.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
aioboto3==13.1.1
aioboto3==13.2.0
# via -r requirements/_test.in
aiobotocore==2.13.1
aiobotocore==2.15.2
# via aioboto3
aiofiles==23.2.1
aiofiles==24.1.0
# via
# -c requirements/_base.txt
# aioboto3
aiohttp==3.9.3
aiohappyeyeballs==2.4.3
# via
# -c requirements/_base.txt
# aiohttp
aiohttp==3.11.7
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
Expand All @@ -21,44 +25,44 @@ asgi-lifespan==2.1.0
# via -r requirements/_test.in
async-asgi-testclient==1.4.11
# via -r requirements/_test.in
attrs==23.2.0
attrs==24.2.0
# via
# -c requirements/_base.txt
# aiohttp
boto3==1.34.131
boto3==1.35.36
# via aiobotocore
botocore==1.34.131
botocore==1.35.36
# via
# aiobotocore
# boto3
# s3transfer
certifi==2024.2.2
certifi==2024.8.30
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
# requests
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via
# -c requirements/_base.txt
# requests
coverage==7.6.1
coverage==7.6.8
# via pytest-cov
docker==7.1.0
# via -r requirements/_test.in
faker==29.0.0
faker==33.0.0
# via -r requirements/_test.in
flaky==3.8.1
# via -r requirements/_test.in
frozenlist==1.4.1
frozenlist==1.5.0
# via
# -c requirements/_base.txt
# aiohttp
# aiosignal
greenlet==3.0.3
greenlet==3.1.1
# via
# -c requirements/_base.txt
# sqlalchemy
idna==3.6
idna==3.10
# via
# -c requirements/_base.txt
# requests
Expand All @@ -69,22 +73,27 @@ jmespath==1.0.1
# via
# boto3
# botocore
multidict==6.0.5
multidict==6.1.0
# via
# -c requirements/_base.txt
# aiohttp
# async-asgi-testclient
# yarl
mypy==1.12.0
mypy==1.13.0
# via sqlalchemy
mypy-extensions==1.0.0
# via mypy
packaging==24.0
packaging==24.2
# via
# -c requirements/_base.txt
# pytest
pluggy==1.5.0
# via pytest
propcache==0.2.0
# via
# -c requirements/_base.txt
# aiohttp
# yarl
pytest==8.3.3
# via
# -r requirements/_test.in
Expand All @@ -95,7 +104,7 @@ pytest-asyncio==0.23.8
# via
# -c requirements/../../../requirements/constraints.txt
# -r requirements/_test.in
pytest-cov==5.0.0
pytest-cov==6.0.0
# via -r requirements/_test.in
pytest-mock==3.14.0
# via -r requirements/_test.in
Expand All @@ -113,7 +122,7 @@ requests==2.32.3
# -c requirements/_base.txt
# async-asgi-testclient
# docker
s3transfer==0.10.2
s3transfer==0.10.4
# via boto3
six==1.16.0
# via
Expand All @@ -123,24 +132,25 @@ sniffio==1.3.1
# via
# -c requirements/_base.txt
# asgi-lifespan
sqlalchemy==1.4.52
sqlalchemy==1.4.54
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
# -r requirements/_test.in
sqlalchemy2-stubs==0.0.2a38
# via sqlalchemy
types-aiobotocore-s3==2.15.1
types-aiobotocore-s3==2.15.2
# via -r requirements/_test.in
types-aiofiles==24.1.0.20240626
# via -r requirements/_test.in
types-psutil==6.0.0.20240901
types-psutil==6.1.0.20241102
# via -r requirements/_test.in
types-pyyaml==6.0.12.20240917
# via -r requirements/_test.in
typing-extensions==4.11.0
typing-extensions==4.12.2
# via
# -c requirements/_base.txt
# faker
# mypy
# sqlalchemy2-stubs
# types-aiobotocore-s3
Expand All @@ -151,11 +161,11 @@ urllib3==2.2.3
# botocore
# docker
# requests
wrapt==1.16.0
wrapt==1.17.0
# via
# -c requirements/_base.txt
# aiobotocore
yarl==1.9.4
yarl==1.18.0
# via
# -c requirements/_base.txt
# aiohttp
41 changes: 20 additions & 21 deletions services/dynamic-sidecar/requirements/_tools.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
astroid==3.3.4
astroid==3.3.5
# via pylint
black==24.8.0
black==24.10.0
# via -r requirements/../../../requirements/devenv.txt
build==1.2.2
build==1.2.2.post1
# via pip-tools
bump2version==1.0.1
# via -r requirements/../../../requirements/devenv.txt
Expand All @@ -13,21 +13,21 @@ click==8.1.7
# -c requirements/_base.txt
# black
# pip-tools
dill==0.3.8
dill==0.3.9
# via pylint
distlib==0.3.8
distlib==0.3.9
# via virtualenv
filelock==3.16.1
# via virtualenv
identify==2.6.1
identify==2.6.3
# via pre-commit
isort==5.13.2
# via
# -r requirements/../../../requirements/devenv.txt
# pylint
mccabe==0.7.0
# via pylint
mypy==1.12.0
mypy==1.13.0
# via
# -c requirements/_test.txt
# -r requirements/../../../requirements/devenv.txt
Expand All @@ -38,50 +38,49 @@ mypy-extensions==1.0.0
# mypy
nodeenv==1.9.1
# via pre-commit
packaging==24.0
packaging==24.2
# via
# -c requirements/_base.txt
# -c requirements/_test.txt
# black
# build
pathspec==0.12.1
# via black
pip==24.2
pip==24.3.1
# via pip-tools
pip-tools==7.4.1
# via -r requirements/../../../requirements/devenv.txt
platformdirs==4.3.6
# via
# -c requirements/_base.txt
# black
# pylint
# virtualenv
pre-commit==3.8.0
pre-commit==4.0.1
# via -r requirements/../../../requirements/devenv.txt
pylint==3.3.0
pylint==3.3.1
# via -r requirements/../../../requirements/devenv.txt
pyproject-hooks==1.1.0
pyproject-hooks==1.2.0
# via
# build
# pip-tools
pyyaml==6.0.1
pyyaml==6.0.2
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
# pre-commit
ruff==0.6.7
ruff==0.8.0
# via -r requirements/../../../requirements/devenv.txt
setuptools==74.0.0
# via
# -c requirements/_base.txt
# pip-tools
setuptools==75.6.0
# via pip-tools
tomlkit==0.13.2
# via pylint
typing-extensions==4.11.0
typing-extensions==4.12.2
# via
# -c requirements/_base.txt
# -c requirements/_test.txt
# mypy
virtualenv==20.26.5
virtualenv==20.28.0
# via pre-commit
wheel==0.44.0
wheel==0.45.1
# via pip-tools
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ async def get_container_logs(
if timestamps:
args["timestamps"] = True

container_logs: list[str] = await container_instance.log(**args)
container_logs: list[str] = await container_instance.log(
**args
) # type:ignore[call-overload]
return container_logs


Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import logging
from collections.abc import AsyncGenerator, Iterable
from contextlib import asynccontextmanager
from typing import Any, cast
from typing import Any

import aiodocker
import yaml
Expand Down Expand Up @@ -65,7 +65,7 @@ async def _get_container(
docker: aiodocker.Docker, container_name: str
) -> DockerContainer | None:
try:
return cast(DockerContainer, await docker.containers.get(container_name))
return await docker.containers.get(container_name)
except aiodocker.DockerError as e:
if e.status == http_status.HTTP_404_NOT_FOUND:
return None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ class _LoggingEventHandler(SafeFileSystemEventHandler):
def event_handler(self, event: FileSystemEvent) -> None:
# NOTE: runs in the created process

file_path = Path(event.src_path)
file_path = Path(
event.src_path.decode()
if isinstance(event.src_path, bytes)
else event.src_path
)
with suppress(FileNotFoundError):
file_stat = file_path.stat()
logger.info(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@


class _ExtendedInotifyBuffer(InotifyBuffer):
def __init__(self, path, recursive=False): # pylint:disable=super-init-not-called
def __init__(
self, path: bytes, *, recursive: bool = False
): # pylint:disable=super-init-not-called
# below call to `BaseThread.__init__` is correct since we want to
# overwrite the `InotifyBuffer.__init__` method
BaseThread.__init__(self) # pylint:disable=non-parent-init-called
self._queue = DelayedQueue(self.delay)
self._inotify = Inotify( # pylint:disable=too-many-function-args
path, recursive, InotifyConstants.IN_ATTRIB
path, recursive=recursive, event_mask=InotifyConstants.IN_ATTRIB
)
self.start()

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


class ExtendedInotifyObserver(BaseObserver):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ def event_handler(self, event: FileSystemEvent) -> None:
# NOTE: ignoring all events which are not relative to modifying
# the contents of the `port_key` folders from the outputs directory

path_relative_to_outputs = Path(event.src_path).relative_to(self.outputs_path)
path_relative_to_outputs = Path(
event.src_path.decode()
if isinstance(event.src_path, bytes)
else event.src_path
).relative_to(self.outputs_path)

# discard event if not part of a subfolder
relative_path_parents = path_relative_to_outputs.parents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@


class _ExtendedInotifyBuffer(InotifyBuffer):
def __init__(self, path, recursive=False): # pylint:disable=super-init-not-called
def __init__(
self, path: bytes, *, recursive: bool = False
): # pylint:disable=super-init-not-called
# below call to `BaseThread.__init__` is correct since we want to
# overwrite the `InotifyBuffer.__init__` method
BaseThread.__init__(self) # pylint:disable=non-parent-init-called
self._queue = DelayedQueue(self.delay)
self._inotify = Inotify( # pylint:disable=too-many-function-args
path, recursive, _EVENTS_TO_WATCH
path, recursive=recursive, event_mask=_EVENTS_TO_WATCH
)
self.start()

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


class ExtendedInotifyObserver(BaseObserver):
Expand Down

0 comments on commit 83a08e7

Please sign in to comment.