fix/mycroft_compat (#485)

* fix/mycroft_compat

* fix imports

mycroft/enclosure/__init__.py

@@ -8,4 +8,4 @@
 to be a drop in replacement for mycroft-core
 
 """
-from ovos_utils.enclosure.api import EnclosureAPI
+from mycroft.enclosure.api import EnclosureAPI

mycroft/enclosure/api.py

@@ -8,4 +8,11 @@
 to be a drop in replacement for mycroft-core
 
 """
-from ovos_utils.enclosure.api import EnclosureAPI
+from ovos_bus_client.apis.enclosure import EnclosureAPI as _EAPI
+from mycroft.enclosure.display_manager import DisplayManager
+
+
+class EnclosureAPI(_EAPI):
+    def __init__(self, bus, name=""):
+        super().__init__(bus, name)
+        self.display_manager = DisplayManager(self.skill_id)

mycroft/enclosure/display_manager.py

@@ -51,7 +51,7 @@
 import os
 
 from ovos_bus_client.client import MessageBusClient
-from ovos_utils import get_ipc_directory
+from ovos_utils.signal import get_ipc_directory
 from ovos_utils.log import LOG
 
 

mycroft/gui/__init__.py

@@ -1,3 +1,3 @@
 # backwards compat imports
-from ovos_utils.gui import GUIInterface
+from ovos_bus_client.apis.gui import GUIInterface
 from ovos_workshop.skills.base import SkillGUI

mycroft/gui/extensions.py

@@ -1,3 +1,2 @@
 # backwards compat import
-from ovos_gui.extensions import ExtensionsManager, GenericExtension, \
-    SmartSpeakerExtension, BigscreenExtension, MobileExtension, PlasmoidExtension
+from ovos_gui.extensions import ExtensionsManager

mycroft/skills/event_scheduler.py

@@ -16,6 +16,7 @@
 times.
 """
 # backwards compat - do not delete until 0.2.0
-from ovos_bus_client.util.scheduler import repeat_time, EventScheduler, create_basic_wrapper, \
+from ovos_bus_client.util.scheduler import repeat_time, EventScheduler, \
     EventContainer, EventSchedulerInterface
+from ovos_utils.events import create_basic_wrapper
 

mycroft/util/audio_test.py

@@ -21,7 +21,7 @@
 
 from ovos_listener.mic import MutableMicrophone
 from ovos_config.config import Configuration
-from ovos_utils.sound import play_wav
+from ovos_utils.sound import play_audio as play_wav
 from mycroft.util.audio_utils import find_input_device
 from ovos_utils.log import LOG
 import logging