Merge pull request #630 from OpenVoiceOS/release-0.3.3a1

Release 0.3.3a1
OpenVoiceOS · Dec 9, 2024 · ab82250 · ab82250
2 parents 88b094d + ee73f58
commit ab82250
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,12 @@
 # Changelog
 
-## [0.3.2a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.3.2a1) (2024-12-06)
+## [0.3.3a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.3.3a1) (2024-12-09)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.3.1...0.3.2a1)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.3.2...0.3.3a1)
 
 **Merged pull requests:**
 
-- fix: pull padatious fixes from ovos-padatious-pipeline-plugin/pul/l26 [\#625](https://github.com/OpenVoiceOS/ovos-core/pull/625) ([JarbasAl](https://github.com/JarbasAl))
+- fix: runtime requirements [\#628](https://github.com/OpenVoiceOS/ovos-core/pull/628) ([JarbasAl](https://github.com/JarbasAl))
 
 
 

diff --git a/ovos_core/skill_manager.py b/ovos_core/skill_manager.py
@@ -302,7 +302,8 @@ def load_plugin_skills(self, network=None, internet=None):
                     LOG.info(f"Consider uninstalling {skill_id} instead of blacklisting it")
                 continue
             if skill_id not in self.plugin_skills and skill_id not in loaded_skill_ids:
-                skill_loader = self._get_plugin_skill_loader(skill_id, init_bus=False)
+                skill_loader = self._get_plugin_skill_loader(skill_id, init_bus=False,
+                                                             skill_class=plug)
                 requirements = skill_loader.runtime_requirements
                 if not network and requirements.network_before_load:
                     continue
@@ -327,7 +328,7 @@ def _get_internal_skill_bus(self):
             bus = self.bus
         return bus
 
-    def _get_plugin_skill_loader(self, skill_id, init_bus=True):
+    def _get_plugin_skill_loader(self, skill_id, init_bus=True, skill_class=None):
         """Get a plugin skill loader.
 
         Args:
@@ -340,7 +341,10 @@ def _get_plugin_skill_loader(self, skill_id, init_bus=True):
         bus = None
         if init_bus:
             bus = self._get_internal_skill_bus()
-        return PluginSkillLoader(bus, skill_id)
+        loader = PluginSkillLoader(bus, skill_id)
+        if skill_class:
+            loader.skill_class = skill_class
+        return loader
 
     def _load_plugin_skill(self, skill_id, skill_plugin):
         """Load a plugin skill.
@@ -352,7 +356,7 @@ def _load_plugin_skill(self, skill_id, skill_plugin):
         Returns:
             PluginSkillLoader: Loaded plugin skill loader instance if successful, None otherwise.
         """
-        skill_loader = self._get_plugin_skill_loader(skill_id)
+        skill_loader = self._get_plugin_skill_loader(skill_id, skill_class=skill_plugin)
         try:
             load_status = skill_loader.load(skill_plugin)
         except Exception:

diff --git a/ovos_core/version.py b/ovos_core/version.py
@@ -1,8 +1,8 @@
 # START_VERSION_BLOCK
 VERSION_MAJOR = 0
 VERSION_MINOR = 3
-VERSION_BUILD = 2
-VERSION_ALPHA = 0
+VERSION_BUILD = 3
+VERSION_ALPHA = 1
 # END_VERSION_BLOCK
 
 # for compat with old imports