From ab4322a9f7870bd999190111e003332719a12670 Mon Sep 17 00:00:00 2001
From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com>
Date: Fri, 10 May 2024 10:35:56 -0700
Subject: [PATCH] Remove `mycroft` imports (#39)

* Refactor to remove `mycroft` module imports
Ensure all dependencies are listed in `requirements.txt`

* Update skill.json

---------

Co-authored-by: Daniel McKnight <daniel@neon.ai>
Co-authored-by: NeonDaniel <NeonDaniel@users.noreply.github.com>
---
 __init__.py           | 4 ++--
 requirements.txt      | 4 +++-
 requirements/test.txt | 2 +-
 skill.json            | 4 +++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/__init__.py b/__init__.py
index 70e811e..f562771 100644
--- a/__init__.py
+++ b/__init__.py
@@ -33,7 +33,7 @@
 from ovos_utils.process_utils import RuntimeRequirements
 from neon_utils.skills.neon_skill import NeonSkill
 from neon_utils.signal_utils import check_for_signal
-from mycroft.skills import intent_handler, intent_file_handler
+from ovos_workshop.decorators import intent_handler
 
 
 class CommunicationSkill(NeonSkill):
@@ -61,7 +61,7 @@ def initialize(self):
         self.add_event("communication:request.message.response",
                        self.handle_send_message_response)
 
-    @intent_file_handler("call.intent")
+    @intent_handler("call.intent")
     def handle_place_call(self, message):
         if self.neon_in_request(message):
             # TODO: Move hesitation to user preference DM
diff --git a/requirements.txt b/requirements.txt
index a781503..3554fa4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,4 @@
 neon-utils~=1.0
-ovos-utils~=0.0, >=0.0.28
\ No newline at end of file
+ovos-utils~=0.0, >=0.0.28
+ovos-workshop~=0.0.15
+adapt-parser<2.0,>=0.5
\ No newline at end of file
diff --git a/requirements/test.txt b/requirements/test.txt
index 55bb597..19363c1 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -1 +1 @@
-neon-minerva[padatious]~=0.1,>=0.1.1a5
+neon-minerva[padatious]~=0.2
diff --git a/skill.json b/skill.json
index 0efd81a..a3777d4 100644
--- a/skill.json
+++ b/skill.json
@@ -10,8 +10,10 @@
     "systemDeps": false,
     "requirements": {
         "python": [
+            "adapt-parser<2.0,>=0.5",
             "neon-utils~=1.0",
-            "ovos-utils~=0.0, >=0.0.28"
+            "ovos-utils~=0.0, >=0.0.28",
+            "ovos-workshop~=0.0.15"
         ],
         "system": {},
         "skill": []