From 3c47a8bf05fa40150ce153f143d75fd442d94928 Mon Sep 17 00:00:00 2001 From: jarbasai Date: Wed, 19 Oct 2022 23:49:52 +0100 Subject: [PATCH 1/2] feat/event_wrappers_in_outils shared logic in central utils package --- ovos_workshop/skills/ovos.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_workshop/skills/ovos.py b/ovos_workshop/skills/ovos.py index 7b9ee022..4baa0b4a 100644 --- a/ovos_workshop/skills/ovos.py +++ b/ovos_workshop/skills/ovos.py @@ -9,7 +9,6 @@ ensure_mycroft_import() -from mycroft.skills.mycroft_skill.event_container import create_wrapper from ovos_utils.skills import get_non_properties from ovos_utils.intents import IntentBuilder, Intent, AdaptIntent from ovos_utils.sound import play_audio @@ -19,6 +18,7 @@ from ovos_workshop.skills.layers import IntentLayers from ovos_workshop.resource_files import SkillResources from ovos_utils.dialog import get_dialog +from ovos_utils.messagebus import create_wrapper class OVOSSkill(MycroftSkill): From ebf71a09a40fe80b4e9193fe047e1ea79f34a034 Mon Sep 17 00:00:00 2001 From: jarbasai Date: Wed, 19 Oct 2022 23:54:46 +0100 Subject: [PATCH 2/2] feat/event_wrappers_in_outils shared logic in central utils package --- requirements/requirements.txt | 2 +- setup.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index d4176174..a675df22 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,4 +1,4 @@ -ovos_utils~=0.0, >=0.0.23 +ovos-utils~=0.0, >=0.0.26a1 ovos_config~=0.0,>=0.0.4 # optional but improves fuzzy matching and silences logs diff --git a/setup.py b/setup.py index 36d374a8..ff66fb48 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,6 @@ def required(requirements_file): if pkg.strip() and not pkg.startswith("#")] - setup( name='ovos_workshop', version=get_version(), @@ -59,8 +58,8 @@ def required(requirements_file): 'ovos_workshop.patches'], install_requires=required("requirements/requirements.txt"), extras_require={ - 'ocp': required('requirements/ocp.txt') - }, + 'ocp': required('requirements/ocp.txt') + }, package_data={'': package_files('ovos_workshop')}, url='https://github.com/OpenVoiceOS/OVOS-workshop', license='apache-2.0',