Update OVOS depdendencies for 0.x compat (#144)

* Update OVOS dependencies for 0.x compat. Refactor imports * Update skill.json --------- Co-authored-by: Daniel McKnight <[email protected]> Co-authored-by: NeonDaniel <[email protected]>
NeonGeckoCom · Sep 17, 2024 · 9fd57db · 9fd57db
1 parent 5dccfdd
commit 9fd57db
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git 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
@@ -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
+ovos-bus-client~=0.0,>=0.0.3
+ovos-workshop~=0.0,>=0.0.12
diff --git 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": []