Refactor to use pip installation function from neon-utils

Author: NeonDaniel

neon_core/util/skill_utils.py

@@ -34,11 +34,12 @@
 from typing import List
 
 from ovos_utils.xdg_utils import xdg_data_home
-from ovos_utils.log import LOG
+from ovos_utils.log import LOG, deprecated
 
 from ovos_config.config import Configuration
 
 
+@deprecated("Internal function is deprecated", "25.09.01")
 def _write_pip_constraints_to_file(output_file: str):
     """
     Writes out a constraints file for OSM to use to prevent broken dependencies
@@ -67,6 +68,7 @@ def _write_pip_constraints_to_file(output_file: str):
     LOG.info(f"Wrote core constraints to file: {output_file}")
 
 
+@deprecated("Internal function is deprecated", "25.09.01")
 def _install_skill_pip(skill_package: str, constraints_file: str) -> bool:
     """
     Pip install the specified package
@@ -92,15 +94,8 @@ def install_skills_from_list(skills_to_install: list, config: dict = None):
     :param skills_to_install: list of skills to install
     :param config: optional dict configuration
     """
-    constraints_file = join(xdg_data_home(), "neon", "constraints.txt")
-    _write_pip_constraints_to_file(constraints_file)
-
-    for spec in skills_to_install:
-        if "://" in spec and "git+" not in spec:
-            LOG.error(f"Got an invalid package spec to install: {spec}")
-        elif not _install_skill_pip(spec, constraints_file):
-            LOG.error(f"Pip installation failed for: {spec}")
-
+    from neon_utils.packaging_utils import install_packages_from_pip
+    install_packages_from_pip("neon-core", skills_to_install, True)
     LOG.info(f"Installed {len(skills_to_install)} skills")
 
 

requirements/requirements.txt

@@ -2,7 +2,8 @@
 ovos-core[lgpl]~=0.1
 
 
-neon-utils[network]~=1.13,>=1.13.1a1
+#neon-utils[network]~=1.13,>=1.13.1a1
+neon-utils[network] @ git+https://github.com/neongeckocom/neon-utils@FEAT_PipInstallGitForce#egg=neon-utils
 ovos-utils~=0.0,>=0.0.38
 ovos-bus-client~=0.0,>=0.0.10
 neon-transformers~=1.0