From 06c14b570a983c847ae17723a945c50edc57c123 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 13 Sep 2024 15:24:59 -0700 Subject: [PATCH 1/2] Update OVOS dependencies for 0.x compat. Refactor imports --- __init__.py | 2 +- requirements.txt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/__init__.py b/__init__.py index 7748d0d..1c426c7 100644 --- a/__init__.py +++ b/__init__.py @@ -39,7 +39,6 @@ from ovos_utils.process_utils import RuntimeRequirements from ovos_utils.log import LOG, log_deprecation from ovos_utils.sound import play_audio -from adapt.intent import IntentBuilder from lingua_franca.format import nice_duration, nice_time, nice_date_time from lingua_franca.parse import extract_duration, extract_datetime from lingua_franca.time import default_timezone @@ -48,6 +47,7 @@ from neon_utils.skills.neon_skill import NeonSkill from neon_utils.user_utils import get_user_prefs, get_message_user from ovos_workshop.decorators import intent_handler +from ovos_workshop.intents import IntentBuilder from skill_alerts.util import Weekdays, AlertState, MatchLevel, AlertPriority, WEEKDAYS, WEEKENDS, EVERYDAY from skill_alerts.util.alert import Alert, AlertType diff --git a/requirements.txt b/requirements.txt index 4fe8fa1..4d27047 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,7 @@ json_database~=0.5 -neon-utils~=1.2 +# TODO: network patching dependency resolution +neon-utils[network]~=1.2,>=1.11.1a3 combo_lock~=0.2 ovos-utils~=0.0, >=0.0.32 -ovos-bus-client~=0.0.3 \ No newline at end of file +ovos-bus-client~=0.0,>=0.0.3 +ovos-workshop~=0.0,>=0.0.12 \ No newline at end of file From 4754538bb6b8a9ac65bb0c34d2b053a39fed4825 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Fri, 13 Sep 2024 22:26:23 +0000 Subject: [PATCH 2/2] Update skill.json --- skill.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/skill.json b/skill.json index 2325bed..d14b595 100644 --- a/skill.json +++ b/skill.json @@ -32,9 +32,10 @@ "python": [ "combo_lock~=0.2", "json_database~=0.5", - "neon-utils~=1.2", - "ovos-bus-client~=0.0.3", - "ovos-utils~=0.0, >=0.0.32" + "neon-utils[network]~=1.2,>=1.11.1a3", + "ovos-bus-client~=0.0,>=0.0.3", + "ovos-utils~=0.0, >=0.0.32", + "ovos-workshop~=0.0,>=0.0.12" ], "system": {}, "skill": []