diff --git a/__init__.py b/__init__.py index cca7c3d..4a1bf08 100644 --- a/__init__.py +++ b/__init__.py @@ -28,9 +28,8 @@ from typing import Optional from enum import Enum -from adapt.intent import IntentBuilder from random import randint -from ovos_bus_client import Message +from ovos_bus_client.message import Message from ovos_utils import classproperty from ovos_utils.log import LOG from ovos_utils.process_utils import RuntimeRequirements @@ -38,6 +37,7 @@ from neon_utils.skills.neon_skill import NeonSkill from neon_utils.validator_utils import numeric_confirmation_validator from ovos_workshop.decorators import intent_handler +from ovos_workshop.intents import IntentBuilder class SystemCommand(Enum): diff --git a/requirements.txt b/requirements.txt index 748abec..599363b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -neon-utils~=1.0 +# TODO: network patching dependency resolution +neon-utils[network]~=1.8,>=1.11.1a3 ovos-utils~=0.0, >=0.0.28 -ovos-bus-client~=0.0.3 -ovos-workshop~=0.0.15 -adapt-parser<2.0,>=0.5 \ No newline at end of file +ovos-bus-client~=0.0,>=0.0.3 +ovos-workshop~=0.0,>=0.0.15 \ No newline at end of file diff --git a/skill.json b/skill.json index 3ea9601..83d21f2 100644 --- a/skill.json +++ b/skill.json @@ -16,11 +16,10 @@ "systemDeps": false, "requirements": { "python": [ - "adapt-parser<2.0,>=0.5", - "neon-utils~=1.0", - "ovos-bus-client~=0.0.3", + "neon-utils[network]~=1.8,>=1.11.1a3", + "ovos-bus-client~=0.0,>=0.0.3", "ovos-utils~=0.0, >=0.0.28", - "ovos-workshop~=0.0.15" + "ovos-workshop~=0.0,>=0.0.15" ], "system": {}, "skill": []