Update ovos-core patching

NeonGeckoCom · Dec 30, 2023 · 1a721ab · 1a721ab
1 parent 059be71
commit 1a721ab
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 170 deletions.
diff --git a/neon_core/skills/__init__.py b/neon_core/skills/__init__.py
@@ -84,20 +84,9 @@
 mycroft.skills.core.MycroftSkill = PatchedMycroftSkill
 mycroft.skills.core.FallbackSkill = mycroft.skills.fallback_skill.FallbackSkill
 
-# TODO: Remove below patches with ovos-core 0.0.8 refactor
-import neon_core.skills.patched_plugin_loader
-import neon_core.skills.patched_skill_settings
+# TODO: Remove below patch after https://github.com/OpenVoiceOS/ovos-core/pull/329
 import neon_core.skills.patched_common_query
 
-from mycroft.skills import api
-from mycroft.skills import skill_manager
-from mycroft.skills.intent_services import padatious_service, converse_service
-from ovos_bus_client.message import Message
-mycroft.skills.api.Message = Message
-mycroft.skills.skill_manager.Message = Message
-mycroft.skills.intent_services.padatious_service.Message = Message
-mycroft.skills.intent_services.converse_service.Message = Message
-
 __all__ = ['intent_handler',
            'intent_file_handler',
            'resting_screen_handler',

diff --git a/neon_core/skills/patched_plugin_loader.py b/neon_core/skills/patched_plugin_loader.py
diff --git a/neon_core/skills/patched_skill_settings.py b/neon_core/skills/patched_skill_settings.py
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -10,10 +10,8 @@ ovos-bus-client~=0.0.8
 neon-transformers~=0.2
 ovos-config~=0.0.12
 ovos-plugin-manager~=0.0.25
-# Testing latest OPM
-ovos-backend-client~=0.0.6
 psutil~=5.6
-ovos-workshop~=0.0.11,>=0.0.12a4
+ovos-workshop~=0.0.15
 
 click~=8.0
 click-default-group~=1.2