From b30010ead9dc7876b2bc1e23144731a42fd8ff81 Mon Sep 17 00:00:00 2001
From: Daniel McKnight <daniel@neon.ai>
Date: Fri, 13 Sep 2024 09:18:51 -0700
Subject: [PATCH 1/4] Update OVOS dependencies to allow 0.x versions Replace
 `adapt.intent` import with `ovos-workshop` wrapper

---
 __init__.py      | 4 ++--
 requirements.txt | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

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..05aa3c9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
 neon-utils~=1.0
 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

From 65c5df95f7bb64d82886d322d0165c43a043bf2f Mon Sep 17 00:00:00 2001
From: NeonDaniel <NeonDaniel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 16:19:54 +0000
Subject: [PATCH 2/4] Update skill.json

---
 skill.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/skill.json b/skill.json
index 3ea9601..891f9c7 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",
+            "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": []

From 2e40f205770e37d901c32df1f01d3e22920d2218 Mon Sep 17 00:00:00 2001
From: Daniel McKnight <daniel@neon.ai>
Date: Fri, 13 Sep 2024 10:40:17 -0700
Subject: [PATCH 3/4] Update neon-utils for dependency compat

---
 requirements.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 05aa3c9..599363b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +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,>=0.0.3
 ovos-workshop~=0.0,>=0.0.15
\ No newline at end of file

From 654c665c174b0e379310c3b6336cbb23bfaaa8a9 Mon Sep 17 00:00:00 2001
From: NeonDaniel <NeonDaniel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 17:41:14 +0000
Subject: [PATCH 4/4] Update skill.json

---
 skill.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skill.json b/skill.json
index 891f9c7..83d21f2 100644
--- a/skill.json
+++ b/skill.json
@@ -16,7 +16,7 @@
     "systemDeps": false,
     "requirements": {
         "python": [
-            "neon-utils~=1.0",
+            "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,>=0.0.15"