From c757094003484ce8c01c941f4115c2ea302f9828 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Tue, 11 Feb 2025 15:10:40 -0800 Subject: [PATCH] Deprecate `PIDLock` initialization Resolve Dockerfile warnings --- Dockerfile | 6 +++--- neon_enclosure/__main__.py | 3 +-- neon_enclosure/admin/__main__.py | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index fcfe8cc..0ab8153 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,9 @@ FROM python:3.10-slim LABEL vendor=neon.ai \ ai.neon.name="neon-enclosure" -ENV OVOS_CONFIG_BASE_FOLDER neon -ENV OVOS_CONFIG_FILENAME neon.yaml -ENV XDG_CONFIG_HOME /config +ENV OVOS_CONFIG_BASE_FOLDER=neon +ENV OVOS_CONFIG_FILENAME=neon.yaml +ENV XDG_CONFIG_HOME=/config RUN apt update && \ apt install -y \ diff --git a/neon_enclosure/__main__.py b/neon_enclosure/__main__.py index 889f7f4..52f78ef 100644 --- a/neon_enclosure/__main__.py +++ b/neon_enclosure/__main__.py @@ -30,7 +30,7 @@ from neon_utils.process_utils import start_malloc, snapshot_malloc, print_malloc from neon_utils.signal_utils import init_signal_bus, init_signal_handlers from ovos_bus_client.util import get_mycroft_bus -from ovos_utils.process_utils import reset_sigint_handler, PIDLock +from ovos_utils.process_utils import reset_sigint_handler from ovos_utils.log import LOG from ovos_utils import wait_for_exit_signal @@ -50,7 +50,6 @@ def main(*args, **kwargs): init_signal_bus(bus) init_signal_handlers() reset_sigint_handler() - PIDLock('enclosure') service = NeonHardwareAbstractionLayer(*args, **kwargs) service.start() wait_for_exit_signal() diff --git a/neon_enclosure/admin/__main__.py b/neon_enclosure/admin/__main__.py index 449a789..799ab6b 100644 --- a/neon_enclosure/admin/__main__.py +++ b/neon_enclosure/admin/__main__.py @@ -30,7 +30,7 @@ from neon_utils.process_utils import start_malloc, snapshot_malloc, print_malloc from neon_utils.signal_utils import init_signal_bus, init_signal_handlers from ovos_bus_client.util import get_mycroft_bus -from ovos_utils.process_utils import reset_sigint_handler, PIDLock +from ovos_utils.process_utils import reset_sigint_handler from ovos_utils import wait_for_exit_signal from ovos_utils.log import LOG @@ -50,7 +50,6 @@ def main(*args, **kwargs): init_signal_bus(bus) init_signal_handlers() reset_sigint_handler() - PIDLock('admin') service = NeonAdminHardwareAbstractionLayer(*args, **kwargs) service.start() wait_for_exit_signal()