bump requirements

.gitignore

@@ -18,3 +18,4 @@ dist
 
 # Created by unit tests
 .pytest_cache/
+/.gtm/

ovos_plugin_common_play/ocp/__init__.py

@@ -8,7 +8,7 @@
 from ovos_utils.gui import can_use_gui
 from ovos_utils.log import LOG
 from ovos_plugin_common_play.ocp.utils import create_desktop_file
-from ovos_utils.messagebus import Message
+from ovos_bus_client.message import Message
 from ovos_workshop import OVOSAbstractApplication
 from padacioso import IntentContainer
 from ovos_utils.intents.intent_service_interface import IntentQueryApi

ovos_plugin_common_play/ocp/gui.py

@@ -6,7 +6,7 @@
 from ovos_bus_client.message import Message
 from ovos_config import Configuration
 from ovos_utils.events import EventSchedulerInterface
-from ovos_utils.gui import GUIInterface
+from ovos_bus_client.apis.gui import GUIInterface
 from ovos_utils.log import LOG
 
 from ovos_plugin_common_play.ocp.status import *

ovos_plugin_common_play/ocp/media.py

@@ -6,7 +6,7 @@
 from ovos_plugin_common_play.ocp.utils import ocp_plugins, find_mime
 from ovos_utils.json_helper import merge_dict
 from ovos_utils.log import LOG
-from ovos_utils.messagebus import Message
+from ovos_bus_client.message import Message
 from os.path import join, dirname
 from dbus_next.service import Variant
 

ovos_plugin_common_play/ocp/mycroft_cps.py

@@ -5,7 +5,8 @@
 from ovos_bus_client.message import dig_for_message
 
 from ovos_plugin_common_play.ocp.constants import OCP_ID
-from ovos_utils.messagebus import Message, wait_for_reply
+from ovos_bus_client.message import Message
+from ovos_bus_client.util import wait_for_reply
 
 from ovos_plugin_common_play.ocp.base import OCPAbstractComponent
 from ovos_plugin_common_play.ocp.status import *

ovos_plugin_common_play/ocp/player.py

@@ -6,7 +6,7 @@
 
 from ovos_utils.gui import is_gui_connected, is_gui_running
 from ovos_utils.log import LOG
-from ovos_utils.messagebus import Message
+from ovos_bus_client.message import Message
 from ovos_config import Configuration
 
 from ovos_plugin_common_play.ocp.gui import OCPMediaPlayerGUI

ovos_plugin_common_play/ocp/search.py

@@ -8,7 +8,8 @@
 from ovos_config.locations import get_xdg_config_save_path
 from ovos_utils.gui import is_gui_connected, is_gui_running
 from ovos_utils.log import LOG
-from ovos_utils.messagebus import Message, get_mycroft_bus
+from ovos_bus_client.message import Message
+from ovos_bus_client.util import get_mycroft_bus
 
 from ovos_plugin_common_play.ocp.base import OCPAbstractComponent
 from ovos_plugin_common_play.ocp.media import Playlist

requirements/requirements.txt

@@ -1,7 +1,7 @@
-ovos-plugin-manager >= 0.0.24a5, < 0.1.0
-ovos-bus-client>=0.0.5, < 0.1.0
-ovos-utils>=0.0.35a8, < 0.1.0
-ovos_workshop >=0.0.12a44, < 0.1.0
+ovos-plugin-manager >= 0.0.25a4, < 0.1.0
+ovos-bus-client>=0.0.7, < 0.1.0
+ovos-utils==0.0.37
+ovos_workshop >=0.0.15a2, < 0.1.0
 ovos_audio_plugin_simple>=0.0.2a3, < 0.1.0
 ovos-ocp-files-plugin~=0.13
 padacioso~=0.2, >=0.1.1

test/ovos-test-mycroft-audio-plugin/ovos_test_mycroft_audio_plugin/__init__.py

@@ -1,4 +1,4 @@
-from mycroft.audio.services import AudioBackend
+from ovos_plugin_manager.templates.audio import AudioBackend
 
 
 class TestMycroftAudioService(AudioBackend):

test/unittests/test_audio_backends.py

@@ -2,7 +2,7 @@
 import unittest
 from unittest.mock import patch
 
-from mycroft.audio.audioservice import AudioService
+from ovos_utils.skills.audioservice import ClassicAudioServiceInterface
 from ovos_config.config import Configuration
 from ovos_utils.messagebus import FakeBus
 
@@ -49,7 +49,7 @@ def get_msg(msg):
 
         self.bus.on("message", get_msg)
 
-        self.audio = AudioService(self.bus)
+        self.audio = ClassicAudioServiceInterface(self.bus)
 
     def test_native_ocp(self):
         # assert that OCP is the selected default backend