Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

shared code with ovos utils #31

Merged
merged 2 commits into from
Oct 19, 2022
Merged

shared code with ovos utils #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c47a8b
feat/event_wrappers_in_outils
JarbasAl Oct 19, 2022
ebf71a0
feat/event_wrappers_in_outils
JarbasAl Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ovos_workshop/skills/ovos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 2 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ def required(requirements_file):
if pkg.strip() and not pkg.startswith("#")]



setup(
name='ovos_workshop',
version=get_version(),
Expand All @@ -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',
Expand Down