Remove Deprecated Code

.github/workflows/setup_tests.yml

@@ -27,10 +27,10 @@ jobs:
           pip install wheel
       - name: Test Core Module Installation
         run: |
-          pip install .[core_modules]
+          pip install .[core-modules]
       - name: Test Skills Installation
         run: |
-          pip install .[skills_required,skills_essential,skills_default,skills_extended]
+          pip install .[skills-required,skills-essential,skills-default,skills-extended]
   pi_image_3_10:
     runs-on: ubuntu-latest
     timeout-minutes: 90

.github/workflows/unit_tests.yml

@@ -32,7 +32,7 @@ jobs:
           sudo apt update
           sudo apt install -y gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev
           pip install wheel
-          pip install . -r requirements/test.txt
+          pip install .[test]
         env:
           GITHUB_TOKEN: ${{secrets.neon_token}}
 

neon_core/skills/service.py

@@ -34,7 +34,7 @@
 from ovos_bus_client import Message, MessageBusClient
 from ovos_config.locale import set_default_lang, set_default_tz
 from ovos_config.config import Configuration
-from ovos_utils.log import LOG, log_deprecation
+from ovos_utils.log import LOG
 from ovos_plugin_manager.skills import get_plugin_skills, get_skill_directories
 from ovos_utils.process_utils import StatusCallbackMap, ProcessState
 from neon_utils.metrics_utils import announce_connection
@@ -106,14 +106,6 @@ def __init__(self,
             stopping_hook=self.callbacks.on_stopping)
         self.skill_manager.name = "skill_manager"
 
-    @property
-    def status(self):
-        log_deprecation("This reference is deprecated. Use "
-                        "`NeonSkillService.skill_manager.status` directly.",
-                        "24.7.0")
-        return self.skill_manager.status
-
-
     def check_health(self):
         """
         Check the health of the skills service and get an error state if the

setup.py

@@ -88,13 +88,6 @@ def get_requirements(requirements_filename: str):
         "test": get_requirements("test.txt"),
         "pi": get_requirements("pi.txt"),
         "docker": get_requirements("docker.txt"),
-        # # TODO: Deprecate `_`-specified extras after 2024.5
-        "core_modules": get_requirements("core_modules.txt"),
-        "skills_required": get_requirements("skills_required.txt"),
-        "skills_essential": get_requirements("skills_essential.txt"),
-        "skills_default": get_requirements("skills_default.txt"),
-        "skills_extended": get_requirements("skills_extended.txt"),
-        # PEP503 specified normalization to `-`
         "core-modules": get_requirements("core_modules.txt"),
         "skills-required": get_requirements("skills_required.txt"),
         "skills-essential": get_requirements("skills_essential.txt"),

test/pi_setup_3_10.sh

@@ -44,6 +44,6 @@ python3.10 -m venv "/core/venv" || exit 11
 . /core/venv/bin/activate
 
 pip install --upgrade pip wheel
-pip install ".[core_modules,skills_required,skills_essential,skills_default,skills_extended,pi]" || exit 11
+pip install ".[core-modules,skills-required,skills-essential,skills-default,skills-extended,pi]" || exit 11
 
-cp -rf /core/test/pi_image_overlay/* /
+cp -rf /core/test/pi_image_overlay/* /

test/pi_setup_3_11.sh

@@ -46,6 +46,6 @@ python3.11 -m venv "/core/venv" || exit 11
 pip install --upgrade pip wheel
 pip install https://github.com/smartgic/python-tflite-runtime/releases/download/2.13.0-cp311/tflite_runtime-2.13.0-cp311-cp311-linux_aarch64.whl
 #pip install https://whl.smartgic.io/tflite_runtime-2.13.0-cp311-cp311-linux_aarch64.whl
-pip install ".[core_modules,skills_required,skills_essential,skills_default,skills_extended,pi]" || exit 11
+pip install ".[core-modules,skills-required,skills-essential,skills-default,skills-extended,pi]" || exit 11
 
-cp -rf /core/test/pi_image_overlay/* /
+cp -rf /core/test/pi_image_overlay/* /

test/test_configuration.py

@@ -69,10 +69,10 @@ def tearDownClass(cls) -> None:
         # os.environ.pop("OVOS_CONFIG_BASE_FOLDER")
         # os.environ.pop("OVOS_CONFIG_FILENAME")
 
+    @unittest.skip("mycroft.configuration is deprecated")
     def test_neon_core_config_init(self):
         from neon_core.configuration import Configuration
         from mycroft.configuration import Configuration as MycroftConfig
-        # TODO: Replace test after ovos_utils YML config compat.
         from neon_core.util.runtime_utils import use_neon_core
 
         configuration = Configuration()
@@ -84,10 +84,8 @@ def test_neon_core_config_init(self):
         from ovos_config.config import read_mycroft_config
         self.assertEqual(configuration, use_neon_core(read_mycroft_config)())
 
+    @unittest.skip("mycroft.configuration is deprecated")
     def test_patch_config(self):
-        from os.path import join
-        import json
-
         test_config_dir = os.path.join(os.path.dirname(__file__), "config")
         os.makedirs(test_config_dir, exist_ok=True)
         os.environ["XDG_CONFIG_HOME"] = test_config_dir

test/test_skills_module.py

@@ -367,12 +367,12 @@ class TestSkillManager(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls) -> None:
-        from neon_core.util.runtime_utils import use_neon_core
-        from neon_utils.configuration_utils import init_config_dir
+        #from neon_core.util.runtime_utils import use_neon_core
+        #from neon_utils.configuration_utils import init_config_dir
         os.environ["XDG_CONFIG_HOME"] = cls.config_dir
         os.environ["OVOS_CONFIG_BASE_FOLDER"] = "neon"
         os.environ["OVOS_CONFIG_FILENAME"] = "neon.yaml"
-        use_neon_core(init_config_dir)()
+        #use_neon_core(init_config_dir)()
 
     @classmethod
     def tearDownClass(cls) -> None: