Skip to content

Commit

Permalink
Resolve license test failure
Browse files Browse the repository at this point in the history
Refactor for upstream ovos-workshop compat.
  • Loading branch information
NeonDaniel committed Oct 10, 2023
1 parent 8356426 commit f78d2ad
Show file tree
Hide file tree
Showing 3 changed files with 334 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/license_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ jobs:
uses: neongeckocom/.github/.github/workflows/license_tests.yml@master
with:
package-extras: audio,configuration,networking
packages-exclude: '^(precise-runner|fann2|tqdm|bs4|ovos-phal-plugin|ovos-skill|neon-core|nvidia|neon-phal-plugin|bitstruct|audioread).*'
4 changes: 4 additions & 0 deletions neon_utils/skills/mycroft_skill.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
from typing import Optional
from json_database import JsonStorage
from ovos_bus_client.message import Message
from ovos_utils.log import log_deprecation
from ovos_workshop.skills.mycroft_skill import MycroftSkill
from ovos_utils.skills.settings import get_local_settings

Expand All @@ -49,6 +50,8 @@
class PatchedMycroftSkill(MycroftSkill):
def __init__(self, name=None, bus=None, *args, **kwargs):
MycroftSkill.__init__(self, name, bus, *args, **kwargs)
log_deprecation("This base class is deprecated. Implement either"
"`NeonSkill` or `OVOSSkill`", "2.0.0")
# TODO: Should below defaults be global config?
# allow skills to specify timeout overrides per-skill
self._speak_timeout = 30
Expand Down Expand Up @@ -80,6 +83,7 @@ def _init_settings(self):
self._initial_settings = dict(self.settings)

def _init_settings_manager(self):
# TODO: Same as upstream implementation?
from ovos_workshop.settings import SkillSettingsManager
self.settings_manager = SkillSettingsManager(self)

Expand Down
Loading

0 comments on commit f78d2ad

Please sign in to comment.