Update imports to drop ovos-common-play dependency

__init__.py

@@ -34,12 +34,16 @@
 from urllib.parse import quote
 from bs4 import BeautifulSoup
 from neon_utils.file_utils import load_commented_file
-from ovos_plugin_common_play import MediaType, PlaybackType
 from ovos_workshop.skills.common_play import OVOSCommonPlaybackSkill, \
     ocp_search
 from ovos_utils import classproperty
 from ovos_utils.log import LOG
 from ovos_utils.process_utils import RuntimeRequirements
+try:
+    from ovos_utils.ocp import MediaType, PlaybackType
+except ImportError:
+    # TODO: Update import to ovos-utils when 0.1 is pinned as a minimum version
+    from ovos_workshop.decorators.ocp import MediaType, PlaybackType
 
 
 class FreeMusicArchiveSkill(OVOSCommonPlaybackSkill):

requirements.txt

@@ -2,5 +2,4 @@ ovos-workshop~=0.0,>=0.0.7
 beautifulsoup4~=4.11
 # TODO: network patching dependency resolution
 neon-utils[network]~=1.0,>=1.11.1a3
-ovos-plugin-common-play~=0.0.3
 ovos-utils~=0.0, >=0.0.28

skill.json

@@ -17,7 +17,6 @@
         "python": [
             "beautifulsoup4~=4.11",
             "neon-utils[network]~=1.0,>=1.11.1a3",
-            "ovos-plugin-common-play~=0.0.3",
             "ovos-utils~=0.0, >=0.0.28",
             "ovos-workshop~=0.0,>=0.0.7"
         ],

test/test_skill.py

@@ -28,7 +28,8 @@
 
 import pytest
 
-from ovos_plugin_common_play import MediaType
+# TODO: Update import to ovos-utils when 0.1 is pinned as a minimum version
+from ovos_workshop.decorators.ocp import MediaType
 from neon_minerva.tests.skill_unit_test_base import SkillTestCase