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.

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

Update deprecated import to supported path #524

Merged
merged 4 commits into from
May 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions neon_utils/skills/neon_fallback_skill.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
from ovos_utils.gui import is_gui_connected
from ovos_utils.log import LOG, log_deprecation, deprecated
from ovos_utils.skills import get_non_properties
from ovos_utils.skills.settings import save_settings
from ovos_utils.xdg_utils import xdg_cache_home
from ovos_workshop.skills import OVOSSkill
from ovos_workshop.skills.fallback import FallbackSkillV1
Expand All @@ -53,7 +52,8 @@
from neon_utils.file_utils import resolve_neon_resource_file
from neon_utils.location_utils import to_system_time
from neon_utils.message_utils import dig_for_message, resolve_message, get_message_user
from neon_utils.skills.neon_skill import CACHE_TIME_OFFSET, DEFAULT_SPEED_MODE, SPEED_MODE_EXTENSION_TIME, NeonSkill
from neon_utils.skills.neon_skill import CACHE_TIME_OFFSET, DEFAULT_SPEED_MODE, SPEED_MODE_EXTENSION_TIME, NeonSkill, \
save_settings
from neon_utils.user_utils import get_user_prefs


Expand Down
1 change: 1 addition & 0 deletions neon_utils/skills/neon_skill.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ def save_settings(skill_dir, skill_settings):
else:
LOG.info(f'Skill settings successfully saved to {settings_path}')


class NeonSkill(OVOSSkill):
def __init__(self, name=None, bus=None, **kwargs):
OVOSSkill.__init__(self, name, bus, **kwargs)
Expand Down
9 changes: 4 additions & 5 deletions tests/web_util_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,12 @@ def test_scrape_page_for_links(self):
try:
links = scrape_page_for_links("neon.ai")
self.assertIsInstance(links, dict)
self.assertIn("about us", links.keys())
self.assertIn("company", links.keys())
# TODO: Update test to validate absolute and relative URL paths
# Relative href
self.assertIn(links["about us"],
("https://neon.ai/aboutus",
"http://neon.ai/aboutus",
"https://neon.ai/index.php/aboutus"))
self.assertIn(links["company"],
("https://neon.ai/company",
"https://neon.ai/company/"))
except ConnectTimeout:
LOG.error("Github testing breaks here")

Expand Down
Loading