From fc0d3b357ef38269208fb06c235f29a5b5953b50 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:53:30 +0100 Subject: [PATCH 01/10] fix:import for latest workshop import moved --- ovos_plugin_common_play/ocp/player.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_plugin_common_play/ocp/player.py b/ovos_plugin_common_play/ocp/player.py index 67a2ccb..26f147b 100644 --- a/ovos_plugin_common_play/ocp/player.py +++ b/ovos_plugin_common_play/ocp/player.py @@ -6,7 +6,7 @@ from ovos_config import Configuration from ovos_utils.log import LOG from ovos_utils.messagebus import Message -from ovos_workshop import OVOSAbstractApplication +from ovos_workshop.app import OVOSAbstractApplication from ovos_workshop.backwards_compat import (PluginStream, LoopState, MediaState, PlayerState, TrackState, PlaybackType, MediaEntry, PlaybackMode, Playlist) From 1939f964bea444391424b3963859202515f7a4d3 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:54:32 +0100 Subject: [PATCH 02/10] Update __init__.py --- ovos_plugin_common_play/ocp/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_plugin_common_play/ocp/__init__.py b/ovos_plugin_common_play/ocp/__init__.py index d5c68b5..1a96f04 100644 --- a/ovos_plugin_common_play/ocp/__init__.py +++ b/ovos_plugin_common_play/ocp/__init__.py @@ -11,7 +11,7 @@ from padacioso import IntentContainer -from ovos_workshop import OVOSAbstractApplication +from ovos_workshop.app import OVOSAbstractApplication from ovos_workshop.decorators.ocp import * from ovos_plugin_manager.ocp import load_stream_extractors From 96941c145bc09bee2265cce3f9a43279981614f9 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:55:11 +0100 Subject: [PATCH 03/10] Update media.py --- ovos_plugin_common_play/ocp/media.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_plugin_common_play/ocp/media.py b/ovos_plugin_common_play/ocp/media.py index f0b3f1f..6854e77 100644 --- a/ovos_plugin_common_play/ocp/media.py +++ b/ovos_plugin_common_play/ocp/media.py @@ -5,7 +5,7 @@ from ovos_bus_client.message import Message from ovos_utils.json_helper import merge_dict from ovos_utils.log import LOG -from ovos_workshop.backwards_compat import MediaState, TrackState, PlaybackType, MediaType, Playlist, PluginStream, MediaEntry as _ME +from ovos_utils.ocp import MediaState, TrackState, PlaybackType, MediaType, Playlist, PluginStream, MediaEntry as _ME from ovos_plugin_common_play.ocp.constants import OCP_ID from ovos_plugin_common_play.ocp.utils import ocp_plugins From 61c9744924de8e564441f6f3c338ad3b7f9f5755 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:55:29 +0100 Subject: [PATCH 04/10] Update mpris.py --- ovos_plugin_common_play/ocp/mpris.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_plugin_common_play/ocp/mpris.py b/ovos_plugin_common_play/ocp/mpris.py index e018de2..d3b12fe 100644 --- a/ovos_plugin_common_play/ocp/mpris.py +++ b/ovos_plugin_common_play/ocp/mpris.py @@ -9,7 +9,7 @@ from dbus_next.service import ServiceInterface, method, dbus_property, PropertyAccess from ovos_bus_client.message import Message from ovos_utils.log import LOG -from ovos_workshop.decorators.ocp import TrackState, PlaybackType, PlayerState, LoopState +from ovos_utils.ocp import TrackState, PlaybackType, PlayerState, LoopState class MprisPlayerCtl(Thread): From 536bb3fc382c154efb3c29a07f9e8f5324de860a Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:55:44 +0100 Subject: [PATCH 05/10] Update player.py --- ovos_plugin_common_play/ocp/player.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_plugin_common_play/ocp/player.py b/ovos_plugin_common_play/ocp/player.py index 26f147b..3fe91a9 100644 --- a/ovos_plugin_common_play/ocp/player.py +++ b/ovos_plugin_common_play/ocp/player.py @@ -7,7 +7,7 @@ from ovos_utils.log import LOG from ovos_utils.messagebus import Message from ovos_workshop.app import OVOSAbstractApplication -from ovos_workshop.backwards_compat import (PluginStream, LoopState, MediaState, PlayerState, TrackState, +from ovos_utils.ocp import (PluginStream, LoopState, MediaState, PlayerState, TrackState, PlaybackType, MediaEntry, PlaybackMode, Playlist) from ovos_plugin_common_play.ocp.constants import OCP_ID From a71e89f0495ddd6b899ec9a996113bc1db9dcdb5 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:56:09 +0100 Subject: [PATCH 06/10] Update player.py --- ovos_plugin_common_play/ocp/player.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ovos_plugin_common_play/ocp/player.py b/ovos_plugin_common_play/ocp/player.py index 3fe91a9..3a5fee8 100644 --- a/ovos_plugin_common_play/ocp/player.py +++ b/ovos_plugin_common_play/ocp/player.py @@ -7,7 +7,7 @@ from ovos_utils.log import LOG from ovos_utils.messagebus import Message from ovos_workshop.app import OVOSAbstractApplication -from ovos_utils.ocp import (PluginStream, LoopState, MediaState, PlayerState, TrackState, +from ovos_utils.ocp import (PluginStream, LoopState, MediaState, PlayerState, TrackState, dict2entry, PlaybackType, MediaEntry, PlaybackMode, Playlist) from ovos_plugin_common_play.ocp.constants import OCP_ID @@ -17,10 +17,7 @@ from ovos_bus_client.apis.ocp import ClassicAudioServiceInterface from ovos_plugin_common_play.ocp.search import OCPSearch from ovos_plugin_common_play.ocp.utils import require_native_source -try: - from ovos_utils.ocp import dict2entry -except ImportError: # older utils version - dict2entry = MediaEntry.from_dict + class OCPMediaPlayer(OVOSAbstractApplication): From 5bd392ea4dc541a259a47c1a599f0b89d09aa3da Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:56:23 +0100 Subject: [PATCH 07/10] Update search.py --- ovos_plugin_common_play/ocp/search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_plugin_common_play/ocp/search.py b/ovos_plugin_common_play/ocp/search.py index 17be31b..ab5f226 100644 --- a/ovos_plugin_common_play/ocp/search.py +++ b/ovos_plugin_common_play/ocp/search.py @@ -3,7 +3,7 @@ from ovos_bus_client.message import Message from ovos_utils.log import LOG -from ovos_workshop.decorators.ocp import MediaType +from ovos_utils.ocp import MediaType from ovos_plugin_common_play.ocp.base import OCPAbstractComponent from ovos_plugin_common_play.ocp.media import Playlist From be82449d72ff7541227e553b702ea0c3089efeec Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:56:36 +0100 Subject: [PATCH 08/10] Update status.py --- ovos_plugin_common_play/ocp/status.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ovos_plugin_common_play/ocp/status.py b/ovos_plugin_common_play/ocp/status.py index ad36991..ff7acc1 100644 --- a/ovos_plugin_common_play/ocp/status.py +++ b/ovos_plugin_common_play/ocp/status.py @@ -1,2 +1,2 @@ -from ovos_workshop.decorators.ocp import * -from ovos_plugin_common_play.ocp.constants import OCP_ID \ No newline at end of file +from ovos_utils.ocp import * +from ovos_plugin_common_play.ocp.constants import OCP_ID From b95a6851edc6c0ffa86c66a7be56cb093d62ed99 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:57:08 +0100 Subject: [PATCH 09/10] Update requirements.txt --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 5b171f4..1213c96 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,6 +1,6 @@ ovos-plugin-manager>=0.0.26,<1.0.0 ovos_bus_client>=0.0.7,<1.0.0 -ovos-utils>=0.0.38,<1.0.0 +ovos-utils>=0.1.0,<1.0.0 ovos-workshop>=0.0.16,<2.0.0 padacioso>=0.1.1,<1.0.0 dbus-next From 132400c5bbabacaf8e875fd24b36c985c855ac2d Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:58:57 +0100 Subject: [PATCH 10/10] Update unit_tests.yml --- .github/workflows/unit_tests.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 5f7c38f..1750a11 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -57,14 +57,7 @@ jobs: - name: Run unittests run: | pytest --cov=ovos_plugin_common_play --cov-report xml test/unittests - # NOTE: additional pytest invocations should also add the --cov-append flag - # or they will overwrite previous invocations' coverage reports - # (for an example, see OVOS Skill Manager's workflow) - - name: Run unittests with ovos-utils 0.0.38 - run: | - pip install ovos-utils==0.0.38 - pytest --cov=ovos_plugin_common_play --cov-report xml test/unittests - name: Upload coverage env: CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}} - uses: codecov/codecov-action@v2 \ No newline at end of file + uses: codecov/codecov-action@v2