From f074b3dc75f80fb87e73f65ed99dec62bbc11f29 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 e0c52bd..79c7023 100644 --- a/__init__.py +++ b/__init__.py @@ -28,7 +28,7 @@ from enum import IntEnum from random import randint -from ovos_bus_client import Message +from ovos_bus_client.message import Message from neon_utils.skills.neon_skill import NeonSkill from neon_utils.validator_utils import numeric_confirmation_validator from neon_utils.configuration_utils import get_user_config_from_mycroft_conf diff --git a/requirements.txt b/requirements.txt index 74e81fa..857df94 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,5 @@ -neon-utils~=1.0 +# TODO: network patching dependency resolution +neon-utils[network]~=1.0,>=1.11.1a3 ovos-utils~=0.0, >=0.0.28 -ovos-bus-client~=0.0.3 +ovos-bus-client~=0.0,>=0.0.3 +ovos-workshop~=0.0,>=0.0.12 \ No newline at end of file From 14700e53e69ae855519d7832e61ee0b2e326acfe Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Fri, 13 Sep 2024 22:25:59 +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 a790507..e76227e 100644 --- a/skill.json +++ b/skill.json @@ -14,9 +14,10 @@ "systemDeps": false, "requirements": { "python": [ - "neon-utils~=1.0", - "ovos-bus-client~=0.0.3", - "ovos-utils~=0.0, >=0.0.28" + "neon-utils[network]~=1.0,>=1.11.1a3", + "ovos-bus-client~=0.0,>=0.0.3", + "ovos-utils~=0.0, >=0.0.28", + "ovos-workshop~=0.0,>=0.0.12" ], "system": {}, "skill": []