OpenVoiceOS · JarbasAl · Jul 10, 2023 · Jul 7, 2023 · Jul 7, 2023 · Jul 7, 2023
diff --git a/ovos_workshop/skills/intent_provider.py b/ovos_workshop/skills/intent_provider.py
@@ -2,7 +2,7 @@
 from time import time as get_time, sleep
 from ovos_utils.log import LOG
 from ovos_utils.messagebus import Message
-from ovos_workshop.skills.ovos import OVOSFallbackSkill
+from ovos_workshop.skills.fallback import FallbackSkill
 from ovos_config.config import read_mycroft_config, update_mycroft_config
 
 
@@ -49,7 +49,8 @@ def calc_intent(self, query):
         return data
 
 
-class IntentEngineSkill(OVOSFallbackSkill):
+# TODO: Finish implementation or deprecate
+class IntentEngineSkill(FallbackSkill):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.engine = None

diff --git a/ovos_workshop/skills/layers.py b/ovos_workshop/skills/layers.py
@@ -1 +1,3 @@
 from ovos_workshop.decorators.layers import IntentLayers
+from ovos_utils.log import log_deprecation
+log_deprecation("Import from `ovos_workshop.decorators.layers`", "0.1.0")
diff --git a/ovos_workshop/skills/mycroft_skill.py b/ovos_workshop/skills/mycroft_skill.py
diff --git a/ovos_workshop/skills/ovos.py b/ovos_workshop/skills/ovos.py
@@ -3,7 +3,7 @@
 from typing import List
 
 from ovos_utils.intents import IntentBuilder, Intent
-from ovos_utils.log import LOG
+from ovos_utils.log import LOG, log_deprecation
 from ovos_utils.messagebus import Message, dig_for_message
 from ovos_utils.skills import get_non_properties
 from ovos_utils.skills.audioservice import OCPInterface
@@ -222,5 +222,8 @@ def send_stop_signal(self, stop_event=None):
 # backwards compat alias, no functional difference
 class OVOSFallbackSkill(OVOSSkill):
     def __new__(cls, *args, **kwargs):
+        log_deprecation("Implement "
+                        "`ovos_workshop.skills.fallback.FallbackSkill`",
+                        "0.1.0")
         from ovos_workshop.skills.fallback import FallbackSkill
         return FallbackSkill(*args, **kwargs)
diff --git a/test/unittests/skills/gui/ui/test.qml → test/__init__.py b/test/unittests/skills/gui/ui/test.qml → test/__init__.py
diff --git a/...kills/intent_file/vocab/en-us/test.intent → test/unittests/__init__.py b/...kills/intent_file/vocab/en-us/test.intent → test/unittests/__init__.py
diff --git a/...s/intent_file/vocab/en-us/test_ent.entity → ...sts/skills/test_mycroft_skill/__init__.py b/...s/intent_file/vocab/en-us/test_ent.entity → ...sts/skills/test_mycroft_skill/__init__.py
diff --git a/test/unittests/skills/test_mycroft_skill/gui/ui/test.qml b/test/unittests/skills/test_mycroft_skill/gui/ui/test.qml
diff --git a/test/unittests/skills/test_mycroft_skill/intent_file/vocab/en-us/test.intent b/test/unittests/skills/test_mycroft_skill/intent_file/vocab/en-us/test.intent
diff --git a/test/unittests/skills/test_mycroft_skill/intent_file/vocab/en-us/test_ent.entity b/test/unittests/skills/test_mycroft_skill/intent_file/vocab/en-us/test_ent.entity
diff --git a/...ts/skills/locale/en-us/turn_off2_test.voc → ...oft_skill/locale/en-us/turn_off2_test.voc b/...ts/skills/locale/en-us/turn_off2_test.voc → ...oft_skill/locale/en-us/turn_off2_test.voc
diff --git a/...sts/skills/locale/en-us/turn_off_test.voc → ...roft_skill/locale/en-us/turn_off_test.voc b/...sts/skills/locale/en-us/turn_off_test.voc → ...roft_skill/locale/en-us/turn_off_test.voc
diff --git a/test/unittests/skills/mocks.py → ...ttests/skills/test_mycroft_skill/mocks.py b/test/unittests/skills/mocks.py → ...ttests/skills/test_mycroft_skill/mocks.py
diff --git a/test/unittests/skills/test_mycroft_skill.py → .../test_mycroft_skill/test_mycroft_skill.py b/test/unittests/skills/test_mycroft_skill.py → .../test_mycroft_skill/test_mycroft_skill.py
@@ -20,12 +20,12 @@
 from os.path import join, dirname, abspath
 from unittest.mock import MagicMock, patch
 
-#import pytest
 from ovos_utils.intents import IntentBuilder
 from ovos_bus_client import Message
 from ovos_config.config import Configuration
 
-from ovos_workshop.decorators import intent_handler, resting_screen_handler, intent_file_handler
+from ovos_workshop.decorators import intent_handler, resting_screen_handler, \
+    intent_file_handler
 from ovos_workshop.skills.mycroft_skill import MycroftSkill
 from .mocks import base_config
 

diff --git a/...skills/test_mycroft_skill_get_response.py → ..._skill/test_mycroft_skill_get_response.py b/...skills/test_mycroft_skill_get_response.py → ..._skill/test_mycroft_skill_get_response.py
diff --git a/test/unittests/skills/test_skill/__init__.py → ...test_mycroft_skill/test_skill/__init__.py b/test/unittests/skills/test_skill/__init__.py → ...test_mycroft_skill/test_skill/__init__.py
diff --git a/...kill/dialog/en-us/what do you want.dialog → ...kill/dialog/en-us/what do you want.dialog b/...kill/dialog/en-us/what do you want.dialog → ...kill/dialog/en-us/what do you want.dialog
diff --git a/...e/in-dialog/dialog/en-us/good_things.list → ...e/in-dialog/dialog/en-us/good_things.list b/...e/in-dialog/dialog/en-us/good_things.list → ...e/in-dialog/dialog/en-us/good_things.list
diff --git a/...in-dialog/dialog/en-us/named_things.value → ...in-dialog/dialog/en-us/named_things.value b/...in-dialog/dialog/en-us/named_things.value → ...in-dialog/dialog/en-us/named_things.value
diff --git a/...late/in-dialog/dialog/en-us/test.template → ...late/in-dialog/dialog/en-us/test.template b/...late/in-dialog/dialog/en-us/test.template → ...late/in-dialog/dialog/en-us/test.template
diff --git a/...e/in-locale/locale/de-de/good_things.list → ...e/in-locale/locale/de-de/good_things.list b/...e/in-locale/locale/de-de/good_things.list → ...e/in-locale/locale/de-de/good_things.list
diff --git a/...in-locale/locale/de-de/named_things.value → ...in-locale/locale/de-de/named_things.value b/...in-locale/locale/de-de/named_things.value → ...in-locale/locale/de-de/named_things.value
diff --git a/...late/in-locale/locale/de-de/test.template → ...late/in-locale/locale/de-de/test.template b/...late/in-locale/locale/de-de/test.template → ...late/in-locale/locale/de-de/test.template
diff --git a/...e/in-locale/locale/en-us/good_things.list → ...e/in-locale/locale/en-us/good_things.list b/...e/in-locale/locale/en-us/good_things.list → ...e/in-locale/locale/en-us/good_things.list
diff --git a/...in-locale/locale/en-us/named_things.value → ...in-locale/locale/en-us/named_things.value b/...in-locale/locale/en-us/named_things.value → ...in-locale/locale/en-us/named_things.value
diff --git a/...in-locale/locale/en-us/not_in_german.list → ...in-locale/locale/en-us/not_in_german.list b/...in-locale/locale/en-us/not_in_german.list → ...in-locale/locale/en-us/not_in_german.list
diff --git a/...late/in-locale/locale/en-us/test.template → ...late/in-locale/locale/en-us/test.template b/...late/in-locale/locale/en-us/test.template → ...late/in-locale/locale/en-us/test.template