Merge pull request #145 from OpenVoiceOS/release-1.1.2a1

Release 1.1.2a1
OpenVoiceOS · Oct 15, 2024 · 3f45430 · 3f45430
2 parents 340ae85 + 6d3b84c
commit 3f45430
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 28 deletions.
diff --git 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
+        uses: codecov/codecov-action@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,16 @@
 # Changelog
 
-## [1.1.1a1](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/1.1.1a1) (2024-10-15)
+## [1.1.2a1](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/1.1.2a1) (2024-10-15)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V1.1.0...1.1.1a1)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V1.1.1...1.1.2a1)
 
 **Merged pull requests:**
 
-- fix: allow latest ovos workshop version [\#142](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/142) ([JarbasAl](https://github.com/JarbasAl))
+- fix:import for latest workshop [\#144](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/144) ([JarbasAl](https://github.com/JarbasAl))
 
-## [V1.1.0](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V1.1.0) (2024-09-17)
+## [V1.1.1](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V1.1.1) (2024-10-15)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/1.1.0...V1.1.0)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/1.1.1...V1.1.1)
 
 
 

diff --git 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
 

diff --git 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

diff --git 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):

diff --git a/ovos_plugin_common_play/ocp/player.py b/ovos_plugin_common_play/ocp/player.py
@@ -6,8 +6,8 @@
 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.backwards_compat import (PluginStream, LoopState, MediaState, PlayerState, TrackState,
+from ovos_workshop.app import OVOSAbstractApplication
+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):

diff --git 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

diff --git 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
+from ovos_utils.ocp import *
+from ovos_plugin_common_play.ocp.constants import OCP_ID
diff --git a/ovos_plugin_common_play/version.py b/ovos_plugin_common_play/version.py
@@ -1,6 +1,6 @@
 # START_VERSION_BLOCK
 VERSION_MAJOR = 1
 VERSION_MINOR = 1
-VERSION_BUILD = 1
-VERSION_ALPHA = 0
+VERSION_BUILD = 2
+VERSION_ALPHA = 1
 # END_VERSION_BLOCK
diff --git 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