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

Remove patches now handled in ovos-core #378

Merged
merged 5 commits into from
Mar 14, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/publish_test_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
publish_alpha_release:
uses: neongeckocom/.github/.github/workflows/publish_alpha_release.yml@FEAT_TagAlphaReleases
uses: neongeckocom/.github/.github/workflows/publish_alpha_release.yml@master
secrets: inherit
with:
version_file: "version.py"
Expand Down
19 changes: 10 additions & 9 deletions neon_core/skills/skill_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
class NeonSkillManager(SkillManager):

def __init__(self, *args, **kwargs):
self.load_lock = RLock() # Prevent multiple network event handling
# self.load_lock = RLock() # Prevent multiple network event handling
super().__init__(*args, **kwargs)
skill_dir = self.get_default_skills_dir()
self.skill_downloader = SkillsStore(
Expand Down Expand Up @@ -92,16 +92,17 @@ def download_or_update_defaults(self):
LOG.error("no internet, skipped default skills installation")

def _load_new_skills(self, *args, **kwargs):
with self.load_lock:
LOG.debug(f"Loading skills: {kwargs}")
super()._load_new_skills(*args, **kwargs)
# with self.load_lock:
# LOG.debug(f"Loading skills: {kwargs}")
# Override load method for config module checks
super()._load_new_skills(*args, **kwargs)

def run(self):
"""Load skills and update periodically from disk and internet."""
self.download_or_update_defaults()
from neon_utils.net_utils import check_online
if check_online():
LOG.debug("Already online, allow skills to load")
self.bus.emit(Message("mycroft.network.connected"))
self.bus.emit(Message("mycroft.internet.connected"))
# from neon_utils.net_utils import check_online
# if check_online():
# LOG.debug("Already online, allow skills to load")
# self.bus.emit(Message("mycroft.network.connected"))
# self.bus.emit(Message("mycroft.internet.connected"))
super().run()
2 changes: 1 addition & 1 deletion requirements/core_modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ neon_speech~=3.1,>=3.1.1a8
neon_audio~=1.3,>=1.3.1

# Below patching alpha version conflicts
ovos-core[audio]~=0.0.6,>=0.0.7a11
ovos-core[audio]~=0.0.6,>=0.0.7a14
2 changes: 1 addition & 1 deletion requirements/pi.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ovos-phal-plugin-configuration-provider~=1.0.0
ovos-phal-plugin-balena-wifi~=1.0.0
ovos-phal-plugin-gui-network-client~=0.0.2
ovos-phal-plugin-network-manager~=1.0.0
ovos-phal-plugin-wifi-setup~=1.0,>=1.0.1
ovos-phal-plugin-wifi-setup~=1.1
ovos-phal-plugin-dashboard==0.0.2a3
ovos-phal-plugin-alsa~=0.0.2
ovos-phal-plugin-system~=0.0.3
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# mycroft
ovos-core[skills_lgpl]~=0.0.6,>=0.0.7a11
ovos-core[skills_lgpl]~=0.0.6,>=0.0.7a14
# utils
neon-utils[network,configuration]~=1.2,>=1.2.4
neon-transformers~=0.2
Expand Down