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-utils deprecated references #654

Merged
merged 2 commits into from
Apr 25, 2024
Merged

Remove ovos-utils deprecated references #654

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
8fcc8b8
Update ovos-utils references for 0.1 compat and update dependency spec
NeonDaniel Apr 25, 2024
167fd17
Update patching in tests to account for refactor
NeonDaniel Apr 25, 2024
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_core/skills/patched_common_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
from ovos_bus_client.session import SessionManager
from ovos_bus_client.message import Message, dig_for_message
from ovos_utils import flatten_list
from ovos_utils.enclosure.api import EnclosureAPI
from ovos_bus_client.apis.enclosure import EnclosureAPI
from ovos_utils.log import LOG
from ovos_utils.messagebus import get_message_lang

Expand Down
2 changes: 1 addition & 1 deletion neon_core/skills/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
from ovos_config.locale import set_default_lang, set_default_tz
from ovos_config.config import Configuration
from ovos_utils.log import LOG
from ovos_utils.skills.locations import get_plugin_skills, get_skill_directories
from ovos_plugin_manager.skills import get_plugin_skills, get_skill_directories
from ovos_utils.process_utils import StatusCallbackMap
from neon_utils.metrics_utils import announce_connection
from neon_utils.signal_utils import init_signal_handlers, init_signal_bus
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
Expand Up @@ -3,7 +3,7 @@ ovos-core==0.0.7
# padacioso==0.1.3a2

neon-utils[network]~=1.10
ovos-utils~=0.0.38
ovos-utils~=0.0,>=0.0.38
ovos-bus-client~=0.0.8
neon-transformers~=0.2
ovos-config~=0.0.12
Expand Down
4 changes: 2 additions & 2 deletions test/test_skills_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ def ready_hook():
stopping_hook.assert_called_once()
service.join(10)

@patch("ovos_utils.skills.locations.get_plugin_skills")
@patch("ovos_utils.skills.locations.get_skill_directories")
@patch("ovos_plugin_manager.skills.get_plugin_skills")
@patch("ovos_plugin_manager.skills.get_skill_directories")
def test_get_skill_dirs(self, skill_dirs, plugin_skills):
from neon_core.skills.service import NeonSkillService

Expand Down
Loading