From 10882a86e4c8c1484b13a088fb80278c0d6c53d2 Mon Sep 17 00:00:00 2001
From: miro <jarbasai@mailfence.com>
Date: Tue, 15 Oct 2024 17:45:08 +0100
Subject: [PATCH] fix imports

---
 mycroft/enclosure/gui.py                      |  2 +-
 mycroft/gui/__init__.py                       |  2 +-
 mycroft/skills/mycroft_skill/mycroft_skill.py |  2 +-
 test/integrationtests/decorator_test_skill.py | 33 -------------------
 4 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 test/integrationtests/decorator_test_skill.py

diff --git a/mycroft/enclosure/gui.py b/mycroft/enclosure/gui.py
index bd6a24c2e43..74f167495e1 100644
--- a/mycroft/enclosure/gui.py
+++ b/mycroft/enclosure/gui.py
@@ -8,4 +8,4 @@
 to be a drop in replacement for mycroft-core
 
 """
-from ovos_workshop.skills.base import SkillGUI
+from ovos_workshop.skills.ovos import SkillGUI
diff --git a/mycroft/gui/__init__.py b/mycroft/gui/__init__.py
index 184ee89227b..d73250046c6 100644
--- a/mycroft/gui/__init__.py
+++ b/mycroft/gui/__init__.py
@@ -1,3 +1,3 @@
 # backwards compat imports
 from ovos_bus_client.apis.gui import GUIInterface
-from ovos_workshop.skills.base import SkillGUI
+from ovos_workshop.skills.ovos import SkillGUI
diff --git a/mycroft/skills/mycroft_skill/mycroft_skill.py b/mycroft/skills/mycroft_skill/mycroft_skill.py
index f1e207dca45..350b8e7b867 100644
--- a/mycroft/skills/mycroft_skill/mycroft_skill.py
+++ b/mycroft/skills/mycroft_skill/mycroft_skill.py
@@ -17,7 +17,7 @@
 # backwards compat imports, do not delete!
 from ovos_workshop.intents import Intent, IntentBuilder, IntentServiceInterface, to_alnum
 from ovos_utils.skills import get_non_properties
-from ovos_workshop.skills.base import SkillGUI
+from ovos_workshop.skills.ovos import SkillGUI
 from ovos_bus_client.message import Message, dig_for_message
 from mycroft.metrics import report_metric
 from ovos_bus_client.util.scheduler import EventScheduler, EventSchedulerInterface
diff --git a/test/integrationtests/decorator_test_skill.py b/test/integrationtests/decorator_test_skill.py
deleted file mode 100644
index 6eb8dd7c4bd..00000000000
--- a/test/integrationtests/decorator_test_skill.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2017 Mycroft AI Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# TODO - move test to ovos-workshop
-from ovos_workshop.intents import IntentBuilder
-
-from ovos_workshop.skills.ovos import OVOSSkill
-from ovos_workshop.decorators import intent_handler, intent_file_handler
-
-
-class TestSkill(OVOSSkill):
-    """ Test skill for intent_handler decorator. """
-    @intent_handler(IntentBuilder('a').require('Keyword').build())
-    def handler(self, message):
-        pass
-
-    @intent_file_handler('test.intent')
-    def handler2(self, message):
-        pass
-
-    def stop(self):
-        pass