From 3145954456c2478cc73eb894a136b34a00ab9e15 Mon Sep 17 00:00:00 2001 From: miro Date: Thu, 21 Nov 2024 19:36:49 +0000 Subject: [PATCH] fix: update deprecated imports from ovos-utils --- ovos_workshop/skills/ovos.py | 2 +- test/unittests/skills/test_active.py | 2 +- test/unittests/skills/test_base.py | 2 +- test/unittests/skills/test_common_query_skill.py | 2 +- test/unittests/skills/test_fallback_skill.py | 2 +- test/unittests/skills/test_idle_display_skill.py | 2 +- test/unittests/skills/test_ovos.py | 2 +- test/unittests/test_abstract_app.py | 4 +--- test/unittests/test_decorators.py | 2 +- test/unittests/test_skill.py | 2 +- test/unittests/test_skill_launcher.py | 2 +- test/unittests/test_skill_loader.py | 2 +- 12 files changed, 12 insertions(+), 14 deletions(-) diff --git a/ovos_workshop/skills/ovos.py b/ovos_workshop/skills/ovos.py index 45d4f075..3e897974 100644 --- a/ovos_workshop/skills/ovos.py +++ b/ovos_workshop/skills/ovos.py @@ -497,7 +497,7 @@ def bus(self, value: MessageBusClient): @param value: new MessageBusClient object """ from ovos_bus_client import MessageBusClient - from ovos_utils.messagebus import FakeBus + from ovos_utils.fakebus import FakeBus if isinstance(value, (MessageBusClient, FakeBus)): self._bus = value else: diff --git a/test/unittests/skills/test_active.py b/test/unittests/skills/test_active.py index dc47e71f..fdbcd86a 100644 --- a/test/unittests/skills/test_active.py +++ b/test/unittests/skills/test_active.py @@ -1,7 +1,7 @@ import unittest from unittest.mock import Mock -from ovos_utils.messagebus import FakeBus +from ovos_utils.fakebus import FakeBus from ovos_workshop.skills.ovos import OVOSSkill from ovos_workshop.skills.active import ActiveSkill diff --git a/test/unittests/skills/test_base.py b/test/unittests/skills/test_base.py index de9a960b..2520184b 100644 --- a/test/unittests/skills/test_base.py +++ b/test/unittests/skills/test_base.py @@ -10,7 +10,7 @@ from os.path import join, dirname, isdir from ovos_workshop.skills.ovos import OVOSSkill -from ovos_utils.messagebus import FakeBus +from ovos_utils.fakebus import FakeBus class TestOVOSSkill(unittest.TestCase): diff --git a/test/unittests/skills/test_common_query_skill.py b/test/unittests/skills/test_common_query_skill.py index 7c1a822c..946b0cf6 100644 --- a/test/unittests/skills/test_common_query_skill.py +++ b/test/unittests/skills/test_common_query_skill.py @@ -1,6 +1,6 @@ from unittest import TestCase -from ovos_utils.messagebus import FakeBus +from ovos_utils.fakebus import FakeBus from ovos_workshop.skills.common_query_skill import CommonQuerySkill, CQSMatchLevel diff --git a/test/unittests/skills/test_fallback_skill.py b/test/unittests/skills/test_fallback_skill.py index d5021a4e..76e6a8f6 100644 --- a/test/unittests/skills/test_fallback_skill.py +++ b/test/unittests/skills/test_fallback_skill.py @@ -3,7 +3,7 @@ from unittest.mock import patch, Mock from threading import Event -from ovos_utils.messagebus import FakeBus +from ovos_utils.fakebus import FakeBus from ovos_bus_client.message import Message from ovos_workshop.decorators import fallback_handler from ovos_workshop.skills.fallback import FallbackSkill diff --git a/test/unittests/skills/test_idle_display_skill.py b/test/unittests/skills/test_idle_display_skill.py index e187bd6d..1662a745 100644 --- a/test/unittests/skills/test_idle_display_skill.py +++ b/test/unittests/skills/test_idle_display_skill.py @@ -1,6 +1,6 @@ import unittest -from ovos_utils.messagebus import FakeBus +from ovos_utils.fakebus import FakeBus from ovos_workshop.skills.ovos import OVOSSkill from ovos_workshop.skills.idle_display_skill import IdleDisplaySkill diff --git a/test/unittests/skills/test_ovos.py b/test/unittests/skills/test_ovos.py index 434e642a..5b83da42 100644 --- a/test/unittests/skills/test_ovos.py +++ b/test/unittests/skills/test_ovos.py @@ -1,7 +1,7 @@ import unittest from ovos_utils.process_utils import RuntimeRequirements -from ovos_utils.messagebus import FakeBus +from ovos_utils.fakebus import FakeBus from ovos_utils import classproperty from ovos_workshop.decorators.layers import IntentLayers from ovos_workshop.resource_files import SkillResources diff --git a/test/unittests/test_abstract_app.py b/test/unittests/test_abstract_app.py index 965f31eb..10f73fc7 100644 --- a/test/unittests/test_abstract_app.py +++ b/test/unittests/test_abstract_app.py @@ -1,11 +1,9 @@ import unittest from os import remove -from os.path import join, dirname from unittest.mock import Mock, patch -from json_database import JsonStorage from ovos_bus_client.apis.gui import GUIInterface -from ovos_utils.messagebus import FakeBus +from ovos_utils.fakebus import FakeBus from ovos_workshop.app import OVOSAbstractApplication from ovos_workshop.skills.ovos import OVOSSkill diff --git a/test/unittests/test_decorators.py b/test/unittests/test_decorators.py index ac3b0a73..54ff787f 100644 --- a/test/unittests/test_decorators.py +++ b/test/unittests/test_decorators.py @@ -5,7 +5,7 @@ from time import sleep from ovos_workshop.skill_launcher import SkillLoader -from ovos_utils.messagebus import FakeBus +from ovos_utils.fakebus import FakeBus from ovos_bus_client.message import Message diff --git a/test/unittests/test_skill.py b/test/unittests/test_skill.py index 571d038b..1532850d 100644 --- a/test/unittests/test_skill.py +++ b/test/unittests/test_skill.py @@ -5,7 +5,7 @@ from ovos_bus_client import Message from ovos_workshop.skills.ovos import OVOSSkill -from ovos_utils.messagebus import FakeBus +from ovos_utils.fakebus import FakeBus from os.path import dirname from ovos_workshop.skill_launcher import SkillLoader diff --git a/test/unittests/test_skill_launcher.py b/test/unittests/test_skill_launcher.py index 5f147163..0e565a4c 100644 --- a/test/unittests/test_skill_launcher.py +++ b/test/unittests/test_skill_launcher.py @@ -5,7 +5,7 @@ from os import environ from os.path import basename, join, dirname, isdir -from ovos_utils.messagebus import FakeBus +from ovos_utils.fakebus import FakeBus class TestSkillLauncherFunctions(unittest.TestCase): diff --git a/test/unittests/test_skill_loader.py b/test/unittests/test_skill_loader.py index 001299f3..40f52f9e 100644 --- a/test/unittests/test_skill_loader.py +++ b/test/unittests/test_skill_loader.py @@ -19,7 +19,7 @@ from unittest.mock import Mock from ovos_utils import classproperty -from ovos_utils.messagebus import FakeBus +from ovos_utils.fakebus import FakeBus from ovos_utils.process_utils import RuntimeRequirements from ovos_workshop.skill_launcher import SkillLoader