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

Remove ovos core dependency #451

Merged
merged 7 commits into from
Jul 10, 2023
Merged

Remove ovos core dependency #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4708ee9
Troubleshoot dependency resolution
NeonDaniel May 19, 2023
696c588
Troubleshoot dependency resolution
NeonDaniel May 19, 2023
233e314
Remove `mycroft` module patching in unit tests
NeonDaniel May 19, 2023
989c232
Refactor missed `mycroft` imports
NeonDaniel May 19, 2023
765ff9f
Fix imports in skill tests
NeonDaniel May 19, 2023
8947253
Remove unused import
NeonDaniel Jul 10, 2023
a578486
Annotate future deprecation of ovos-core test dependency
NeonDaniel Jul 10, 2023
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 neon_utils/skills/common_play_skill.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
from ovos_bus_client import Message
from neon_utils.skills.neon_skill import NeonSkill

from mycroft.skills.audioservice import AudioService
from ovos_utils.skills.audioservice import AudioServiceInterface as AudioService


class CPSMatchLevel(Enum):
Expand Down
2 changes: 1 addition & 1 deletion neon_utils/skills/neon_skill.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ def voc_match(self, utt, voc_filename, lang=None, exact=False):
voc = resolve_neon_resource_file(f"text/{lang}/{voc_filename}.voc")
if not voc:
raise FileNotFoundError(voc)
from mycroft.skills.skill_data import read_vocab_file
from ovos_utils.file_utils import read_vocab_file
from itertools import chain
import re
vocab = read_vocab_file(voc)
Expand Down
1 change: 0 additions & 1 deletion neon_utils/validator_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

from neon_utils import LOG
from lingua_franca import parse, set_default_lang

from ovos_workshop.skills.mycroft_skill import MycroftSkill
Expand Down
5 changes: 3 additions & 2 deletions requirements/test_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ pytest
pytest-timeout
pytest-cov
mock
ovos-core[skills,skills_lgpl]
ovos-plugin-manager~=0.0.17
# TODO: Deprecate ovos-core test dependency
ovos-core~=0.0.7,>=0.0.8a21
ovos-plugin-manager~=0.0.18
ovos-skills-manager
neon-lang-plugin-libretranslate
8 changes: 3 additions & 5 deletions tests/skills/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@
CommonQuerySkill, NeonFallbackSkill, NeonSkill, PatchedMycroftSkill,\
InstructorSkill, KioskSkill

import importlib
import mycroft.skills
mycroft.skills.mycroft_skill.MycroftSkill = PatchedMycroftSkill
importlib.reload(mycroft.skills.fallback_skill)
from mycroft.skills.fallback_skill import FallbackSkill
import ovos_workshop.skills.ovos
ovos_workshop.skills.ovos.MycroftSkill = PatchedMycroftSkill
from ovos_workshop.skills.fallback import FallbackSkill


class TestCMS(CommonMessageSkill):
Expand Down