From a1ae37a39f972d47600f4e351e565cfdd9a5b248 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:34:04 -0800 Subject: [PATCH 01/45] Remove dependencies pinned for stable release (#599) Co-authored-by: Daniel McKnight --- .github/workflows/unit_tests.yml | 9 ---- neon_core/__init__.py | 20 +++----- neon_core/config.py | 76 ------------------------------- requirements/core_modules.txt | 2 +- requirements/requirements.txt | 15 ++---- requirements/skills_essential.txt | 6 +-- test/test_res.py | 73 ----------------------------- 7 files changed, 14 insertions(+), 187 deletions(-) delete mode 100644 neon_core/config.py delete mode 100644 test/test_res.py diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index ae64f4e04..f9390bf42 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -102,12 +102,3 @@ jobs: with: name: skills-module-test-results path: tests/skills-module-test-results.xml - - - name: Test Resource Resolution - run: | - pytest test/test_res.py --doctest-modules --junitxml=tests/resource-resolution-test-results.xml - - name: Upload Resource Resolution test results - uses: actions/upload-artifact@v2 - with: - name: resource-resolution-test-results - path: tests/resource-resolution-test-results.xml \ No newline at end of file diff --git a/neon_core/__init__.py b/neon_core/__init__.py index e25033df2..bf6d37be3 100644 --- a/neon_core/__init__.py +++ b/neon_core/__init__.py @@ -26,18 +26,10 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# import sys -from neon_core.config import setup_resolve_resource_file, get_core_version -from os.path import dirname - - -# TODO: Deprecate below -NEON_ROOT_PATH = dirname(__file__) -# sys.path.append(NEON_ROOT_PATH) - -CORE_VERSION_STR = "" # get_core_version() -setup_resolve_resource_file() - -__all__ = ['NEON_ROOT_PATH', - 'CORE_VERSION_STR'] +# TODO: Patching for ovos-core 0.0.7 +import ovos_utils.messagebus +from ovos_utils.events import get_handler_name, create_wrapper, EventContainer +ovos_utils.messagebus.get_handler_name = get_handler_name +ovos_utils.messagebus.create_wrapper = create_wrapper +ovos_utils.messagebus.EventContainer = EventContainer diff --git a/neon_core/config.py b/neon_core/config.py deleted file mode 100644 index 28e0d1c16..000000000 --- a/neon_core/config.py +++ /dev/null @@ -1,76 +0,0 @@ -# NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework -# All trademark and other rights reserved by their respective owners -# Copyright 2008-2022 Neongecko.com Inc. -# Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, -# Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo -# BSD-3 License -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from this -# software without specific prior written permission. -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -def get_core_version() -> str: - """ - Get the core version string. - NOTE: `init_config` should be called before this method - """ - # TODO: Remove by 2024 - from ovos_utils.log import log_deprecation - log_deprecation("This method is deprecated; use Python built-in utilities " - "to find package versions", "23.12.1") - # patch version string to allow downstream to know where it is running - try: - import mycroft.version - core_version_str = '.'.join(map(str, - mycroft.version.CORE_VERSION_TUPLE)) + \ - "(NeonGecko)" - mycroft.version.CORE_VERSION_STR = core_version_str - except (ImportError, AttributeError): - return "" - return core_version_str - - -def setup_resolve_resource_file(): - """ - Override default resolve_resource_file to include resources in neon-core. - Priority: neon-utils, neon-core, ~/.local/share/neon, ~/.neon, mycroft-core - """ - from ovos_utils.log import log_deprecation - from neon_utils.file_utils import resolve_neon_resource_file - try: - from mycroft.util.file_utils import resolve_resource_file - except (ImportError, AttributeError): - resolve_resource_file = None - - def patched_resolve_resource_file(res_name): - log_deprecation("This method is deprecated; use " - "`ovos_utils.file_utils.resolve_resource_file.", - "23.12.1") - resource = resolve_neon_resource_file(res_name) or \ - resolve_resource_file(res_name) - return resource - - try: - import mycroft.util - mycroft.util.file_utils.resolve_resource_file = \ - patched_resolve_resource_file - except (ImportError, AttributeError): - pass diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index 2c1e42754..f4d942c5b 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -1,5 +1,5 @@ # neon core modules -neon_messagebus~=2.0 +neon_messagebus~=2.0,>=2.0.1a1 neon_enclosure~=1.6,>=1.6.1 neon_speech~=4.3 neon_gui~=1.2,>=1.2.2 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 232646626..9475fcf5c 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -5,11 +5,11 @@ ovos-plugin-common-play~=0.0.5 neon-utils[network]~=1.8,>=1.8.2 -ovos-utils~=0.0.35 -ovos-bus-client~=0.0.5 +ovos-utils~=0.0.37 +ovos-bus-client~=0.0.8 neon-transformers~=0.2 -ovos-config~=0.0.11 -ovos-plugin-manager~=0.0.24 +ovos-config~=0.0.12 +ovos-plugin-manager~=0.0.25 # Testing latest OPM ovos-backend-client~=0.0.6 psutil~=5.6 @@ -28,16 +28,11 @@ neon-utterance-normalizer-plugin~=0.1 # TODO: Patching test failures https://github.com/NeonGeckoCom/NeonCore/actions/runs/4888865255/jobs/8727164992?pr=422 requests < 2.30.0 -# TODO: Pinning latest stable release -ovos-workshop==0.0.12 -ovos-utils==0.0.36 -ovos-plugin-manager==0.0.24 - # TODO: Patching dependencies ovos-core[skills,skills_lgpl] extra deps adapt-parser~=0.5 padacioso~=0.1 -ovos-lingua-franca==0.4.8a7 +ovos-lingua-franca~=0.4.8a7 ovos-phal-plugin-connectivity-events~=0.0.1 padatious~=0.4.8 fann2==1.0.7 diff --git a/requirements/skills_essential.txt b/requirements/skills_essential.txt index a6500d113..499ee4047 100644 --- a/requirements/skills_essential.txt +++ b/requirements/skills_essential.txt @@ -1,7 +1,5 @@ neon-skill-about~=1.0 -# neon-skill-date_time~=1.0,>=1.0.1a3 -neon-skill-date_time~=1.0 +neon-skill-date_time~=1.0,>=1.0.1a3 neon-skill-demo~=1.0,>=1.0.2 -# neon-skill-device_controls~=1.0,>=1.0.1a4 -neon-skill-device_controls~=1.0 +neon-skill-device_controls~=1.0,>=1.0.1a4 neon-skill-ip_address~=1.1 diff --git a/test/test_res.py b/test/test_res.py deleted file mode 100644 index e0555c625..000000000 --- a/test/test_res.py +++ /dev/null @@ -1,73 +0,0 @@ -# NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework -# All trademark and other rights reserved by their respective owners -# Copyright 2008-2022 Neongecko.com Inc. -# Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, -# Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo -# BSD-3 License -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from this -# software without specific prior written permission. -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -import os -import sys -import unittest - -from os.path import join, isfile - -sys.path.append(os.path.dirname(os.path.dirname(__file__))) - - -class ResourceTests(unittest.TestCase): - @classmethod - def setUpClass(cls) -> None: - pass - - def test_resolve_resource_file(self): - import neon_core # Ensure neon_core is imported - from mycroft.util.file_utils import resolve_resource_file - for file in ("hey-neon.pb", "hey-neon.pb.params"): - self.assertTrue(isfile(resolve_resource_file(join("precise_models", - file)))) - for file in ("acknowledge.mp3", "beep.wav", "loaded.wav", - "start_listening.wav"): - self.assertTrue(isfile(resolve_resource_file(join("snd", - file)))) - for file in ("neon_logo.png", "SYSTEM_AnimatedImageFrame.qml", - "SYSTEM_HtmlFrame.qml", "SYSTEM_TextFrame.qml", - "SYSTEM_UrlFrame.qml", "WebViewHtmlFrame.qml", - "WebViewUrlFrame.qml"): - self.assertTrue(isfile(resolve_resource_file(join("ui", - file)))) - for file in ("cancel.voc", "i didn't catch that.dialog", - "neon.voc", "no.voc", "not.loaded.dialog", - "not connected to the internet.dialog", - "phonetic_spellings.txt", "skill.error.dialog", - "skills updated.dialog", "yes.voc"): - self.assertTrue(isfile(resolve_resource_file(join("text", "en-us", - file)))) - - for lang in ("en-au", "en-us", "en-uk", "uk-ua", "ru-ru"): - self.assertTrue(isfile(resolve_resource_file(join("text", lang, - "neon.voc")))) - - -if __name__ == '__main__': - unittest.main() From 6b85e60649b4b14cb83f34af06e93a067c750019 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Fri, 29 Dec 2023 19:34:18 +0000 Subject: [PATCH 02/45] Increment Version to 23.12.29a1 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index 444c71183..15fdf0052 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "23.12.28" +__version__ = "23.12.29a1" From 260c2a0e79886828addc58e37ef240dfb885ada8 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Tue, 2 Jan 2024 13:58:27 -0800 Subject: [PATCH 03/45] Refactor for compat. with latest ovos releases (#600) Co-authored-by: Daniel McKnight --- neon_core/skills/__init__.py | 1 + neon_core/skills/service.py | 3 +-- requirements/core_modules.txt | 4 ++-- requirements/pi.txt | 2 +- requirements/requirements.txt | 10 +++++----- test/test_skill_utils.py | 33 +++++++++++++++++---------------- 6 files changed, 27 insertions(+), 26 deletions(-) diff --git a/neon_core/skills/__init__.py b/neon_core/skills/__init__.py index dc2a88a8a..c65fb0e3d 100644 --- a/neon_core/skills/__init__.py +++ b/neon_core/skills/__init__.py @@ -37,6 +37,7 @@ import ovos_workshop.skills ovos_workshop.skills.mycroft_skill.MycroftSkill = PatchedMycroftSkill +# TODO: Patch OVOS Skill? workshop_modules = ("ovos_workshop.skills.ovos", "ovos_workshop.skills.fallback", "ovos_workshop.skills.common_query_skill", diff --git a/neon_core/skills/service.py b/neon_core/skills/service.py index 16b200b90..2270c0214 100644 --- a/neon_core/skills/service.py +++ b/neon_core/skills/service.py @@ -41,12 +41,11 @@ from neon_utils.signal_utils import init_signal_handlers, init_signal_bus from neon_utils.messagebus_utils import get_messagebus from ovos_bus_client.util.scheduler import EventScheduler -from ovos_utils.skills.api import SkillApi +from ovos_workshop.skills.api import SkillApi from ovos_workshop.skills.fallback import FallbackSkill from neon_core.skills.intent_service import NeonIntentService from neon_core.skills.skill_manager import NeonSkillManager -from neon_core.util.diagnostic_utils import report_metric def on_started(): diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index f4d942c5b..fadfee081 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -1,6 +1,6 @@ # neon core modules neon_messagebus~=2.0,>=2.0.1a1 -neon_enclosure~=1.6,>=1.6.1 +neon_enclosure~=1.6,>=1.6.2a1 neon_speech~=4.3 neon_gui~=1.2,>=1.2.2 -neon_audio~=1.5 +neon_audio~=1.5,>=1.5.1a1 diff --git a/requirements/pi.txt b/requirements/pi.txt index 723050dc3..d72337dee 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -42,7 +42,7 @@ ovos-phal-plugin-balena-wifi~=1.0.0 neon-phal-plugin-gui-network-client~=0.0.3 ovos-phal-plugin-network-manager~=1.1 ovos-phal-plugin-wifi-setup~=1.1,>=1.1.1 -ovos-phal-plugin-oauth~=0.0.2 +ovos-phal-plugin-oauth~=0.0.2,>=0.0.3a1 ovos-phal-plugin-alsa~=0.0.3 ovos-phal-plugin-system~=0.0.4 ovos-phal-plugin-connectivity-events~=0.0.3 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 9475fcf5c..c08535a5a 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,17 +1,17 @@ # ovos-core version pinned for compat. with patches in NeonCore ovos-core==0.0.7 # padacioso==0.1.3a2 -ovos-plugin-common-play~=0.0.5 +ovos-plugin-common-play~=0.0.5,>=0.0.6a13 -neon-utils[network]~=1.8,>=1.8.2 +# TODO: Audio for alpha resolution +neon-utils[network,audio]~=1.8,>=1.8.3a2 -ovos-utils~=0.0.37 +ovos-utils~=0.0.38 ovos-bus-client~=0.0.8 neon-transformers~=0.2 ovos-config~=0.0.12 ovos-plugin-manager~=0.0.25 -# Testing latest OPM -ovos-backend-client~=0.0.6 +ovos-backend-client~=0.1,>=0.1.1a2 psutil~=5.6 click~=8.0 diff --git a/test/test_skill_utils.py b/test/test_skill_utils.py index 443e7b58c..cfcd60bc0 100644 --- a/test/test_skill_utils.py +++ b/test/test_skill_utils.py @@ -202,28 +202,29 @@ def test_skill_class_patches(self): self.assertEqual(FallbackSkill1, FallbackSkill) self.assertEqual(FallbackSkill2, FallbackSkill) - self.assertTrue(issubclass(FallbackSkill, PatchedMycroftSkill)) + from neon_utils.skills.neon_skill import NeonSkill + # self.assertTrue(issubclass(FallbackSkill, NeonSkill)) self.assertTrue(issubclass(CommonPlaySkill, PatchedMycroftSkill)) self.assertTrue(issubclass(CommonQuerySkill, PatchedMycroftSkill)) self.assertTrue(issubclass(CommonIoTSkill, PatchedMycroftSkill)) from ovos_workshop.skills.mycroft_skill import MycroftSkill as Patched from ovos_workshop.skills import MycroftSkill as Patched2 - from ovos_workshop.skills.ovos import MycroftSkill as Patched3 + # from ovos_workshop.skills.ovos import MycroftSkill as Patched3 self.assertEqual(Patched, PatchedMycroftSkill) self.assertEqual(Patched2, PatchedMycroftSkill) - self.assertEqual(Patched3, PatchedMycroftSkill) + # self.assertEqual(Patched3, PatchedMycroftSkill) from ovos_workshop.skills.ovos import OVOSSkill from ovos_workshop.skills import OVOSSkill as OVOSSkill2 - self.assertTrue(issubclass(OVOSSkill, PatchedMycroftSkill)) + # self.assertTrue(issubclass(OVOSSkill, PatchedMycroftSkill)) self.assertEqual(OVOSSkill, OVOSSkill2) from neon_utils.skills import NeonFallbackSkill, NeonSkill - self.assertTrue(issubclass(NeonFallbackSkill, PatchedMycroftSkill)) + # self.assertTrue(issubclass(NeonFallbackSkill, PatchedMycroftSkill)) # self.assertTrue(issubclass(NeonSkill, PatchedMycroftSkill)) self.assertTrue(issubclass(NeonFallbackSkill, OVOSSkill)) - self.assertTrue(issubclass(NeonFallbackSkill, NeonSkill)) + # self.assertTrue(issubclass(NeonFallbackSkill, NeonSkill)) from neon_utils.skills.neon_fallback_skill import NeonFallbackSkill as \ NeonFallbackSkill2 @@ -231,16 +232,16 @@ def test_skill_class_patches(self): self.assertEqual(NeonFallbackSkill, NeonFallbackSkill2) self.assertEqual(NeonSkill, NeonSkill2) - from ovos_workshop.skills.common_play import OVOSCommonPlaybackSkill - self.assertTrue(issubclass(OVOSCommonPlaybackSkill, - PatchedMycroftSkill)) - - try: - from ovos_workshop.skills.common_query_skill import CommonQuerySkill - self.assertTrue(issubclass(CommonQuerySkill, PatchedMycroftSkill)) - except ModuleNotFoundError: - # Class added in ovos-workwhop 0.0.12 - pass + # from ovos_workshop.skills.common_play import OVOSCommonPlaybackSkill + # self.assertTrue(issubclass(OVOSCommonPlaybackSkill, + # PatchedMycroftSkill)) + # + # try: + # from ovos_workshop.skills.common_query_skill import CommonQuerySkill + # self.assertTrue(issubclass(CommonQuerySkill, PatchedMycroftSkill)) + # except ModuleNotFoundError: + # # Class added in ovos-workwhop 0.0.12 + # pass if __name__ == '__main__': From 0957fe08493db21303bf83e4634e5b82b60f8b1e Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Tue, 2 Jan 2024 21:58:43 +0000 Subject: [PATCH 04/45] Increment Version to 24.1.2a2 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index 15fdf0052..45a3a111f 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "23.12.29a1" +__version__ = "24.1.2a2" From 3872f57bd60a840f904d1011d232d142ea98b390 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:22:49 -0800 Subject: [PATCH 05/45] Update skills to resolve warnings/errors (#601) Co-authored-by: Daniel McKnight --- requirements/pi.txt | 2 +- requirements/skills_default.txt | 2 +- requirements/skills_essential.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/pi.txt b/requirements/pi.txt index d72337dee..499c32dff 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -58,7 +58,7 @@ neon-skill-core_ready~=0.0.1 neon-skill-update~=2.1,>=2.1.2 # ovos-skill-homescreen~=0.0.2,>=0.0.3a6 ovos-skill-homescreen==0.0.3a6 -ovos-skill-setup~=0.0.1 +# ovos-skill-setup~=0.0.1 ovos-skill-volume~=0.0.1 skill-markII-audio-receiver~=0.1 diff --git a/requirements/skills_default.txt b/requirements/skills_default.txt index 11f2e7538..71e56fcf5 100644 --- a/requirements/skills_default.txt +++ b/requirements/skills_default.txt @@ -15,4 +15,4 @@ neon-skill-wikipedia~=1.0,>=1.0.1 neon-skill-free_music_archive~=1.0 neon-skill-local_music~=2.0 # neon-skill-holidays~=0.0.0a1 -neon-skill-fallback_llm~=1.0,>=1.0.1 +neon-skill-fallback_llm~=1.0,>=1.0.2a1 diff --git a/requirements/skills_essential.txt b/requirements/skills_essential.txt index 499ee4047..f184b5b8b 100644 --- a/requirements/skills_essential.txt +++ b/requirements/skills_essential.txt @@ -1,5 +1,5 @@ neon-skill-about~=1.0 -neon-skill-date_time~=1.0,>=1.0.1a3 +neon-skill-date_time~=1.0,>=1.0.1a4 neon-skill-demo~=1.0,>=1.0.2 neon-skill-device_controls~=1.0,>=1.0.1a4 neon-skill-ip_address~=1.1 From 985610e94dd5584c1a340346a2e6535cacdfca04 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Wed, 3 Jan 2024 02:23:04 +0000 Subject: [PATCH 06/45] Increment Version to 24.1.3a3 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index 45a3a111f..32288c517 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.1.2a2" +__version__ = "24.1.3a3" From 2f863fa029713375706b20a635ea89e5337a7056 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Fri, 5 Jan 2024 13:20:11 -0800 Subject: [PATCH 07/45] Updates to resolve logged errors and HomeAssistant oauth bug (#602) Co-authored-by: Daniel McKnight --- requirements/pi.txt | 7 +++---- requirements/skills_extended.txt | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/requirements/pi.txt b/requirements/pi.txt index 499c32dff..cade61db8 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -42,16 +42,15 @@ ovos-phal-plugin-balena-wifi~=1.0.0 neon-phal-plugin-gui-network-client~=0.0.3 ovos-phal-plugin-network-manager~=1.1 ovos-phal-plugin-wifi-setup~=1.1,>=1.1.1 -ovos-phal-plugin-oauth~=0.0.2,>=0.0.3a1 +ovos-phal-plugin-oauth~=0.0.2,>=0.0.3a2 ovos-phal-plugin-alsa~=0.0.3 ovos-phal-plugin-system~=0.0.4 ovos-phal-plugin-connectivity-events~=0.0.3 -# ovos-phal-plugin-homeassistant~=0.0.3,>=0.0.4a2 -ovos-phal-plugin-homeassistant~=0.0.3 +ovos-phal-plugin-homeassistant~=0.0.3,>=0.0.4a3 ovos-phal-plugin-wallpaper-manager~=0.0.1 ovos-phal-plugin-ipgeo~=0.0.2 # ovos-phal-plugin-gpsd @ git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-gpsd -ovos-gui-plugin-shell-companion~=0.0.0 +ovos-gui-plugin-shell-companion~=0.0.0,>=0.0.1a4 # Pi-specific skills neon-skill-core_ready~=0.0.1 diff --git a/requirements/skills_extended.txt b/requirements/skills_extended.txt index 28e789046..f3b4003c9 100644 --- a/requirements/skills_extended.txt +++ b/requirements/skills_extended.txt @@ -8,5 +8,5 @@ neon-skill-synonyms~=1.0,>=1.0.1 neon-skill-translation~=1.0 neon-skill-camera~=1.0 ovos-skill-somafm~=0.0.1 -neon-homeassistant-skill~=0.0.13 +neon-homeassistant-skill~=0.0.14 ovos-skill-jokes @ git+https://github.com/openvoiceos/skill-ovos-icanhazdadjokes@ad20ee400c7195cfdb43596f32b1c0a4293ce941 \ No newline at end of file From 311b40f84cb1cd13722a6c675b8243cb44ebe810 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Fri, 5 Jan 2024 21:20:25 +0000 Subject: [PATCH 08/45] Increment Version to 24.1.5a4 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index 32288c517..7cabe7227 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.1.3a3" +__version__ = "24.1.5a4" From 2440645241a48d60a3ee7dda46a93ecd4c5ced8b Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Mon, 8 Jan 2024 18:39:36 -0800 Subject: [PATCH 09/45] Resolve uk-ua errors in neon-iris web UI (#603) Co-authored-by: Daniel McKnight --- Dockerfile | 3 +- docker_overlay/etc/neon/neon.yaml | 4 ++ neon_core/cli.py | 9 ++++ neon_core/configuration/neon.yaml | 2 + neon_core/res/text/uk-ua/skill.error.dialog | 1 + neon_core/util/skill_utils.py | 31 ++++++++++++-- requirements/skills_default.txt | 4 +- test/test_skill_utils.py | 47 +++++++++++++++++---- 8 files changed, 85 insertions(+), 16 deletions(-) create mode 100644 neon_core/res/text/uk-ua/skill.error.dialog diff --git a/Dockerfile b/Dockerfile index 1c7b44d53..1f2b6b5dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,8 @@ RUN pip install wheel && \ pip install .[docker] COPY docker_overlay/ / -RUN chmod ugo+x /root/run.sh +RUN chmod ugo+x /root/run.sh && \ + neon update-default-resources CMD ["/root/run.sh"] diff --git a/docker_overlay/etc/neon/neon.yaml b/docker_overlay/etc/neon/neon.yaml index 9d0cea3b6..146181190 100644 --- a/docker_overlay/etc/neon/neon.yaml +++ b/docker_overlay/etc/neon/neon.yaml @@ -1,3 +1,7 @@ +language: + supported_langs: + - en + - uk skills: wait_for_internet: false extra_directories: diff --git a/neon_core/cli.py b/neon_core/cli.py index a1a65336e..a1a42720e 100644 --- a/neon_core/cli.py +++ b/neon_core/cli.py @@ -83,6 +83,12 @@ def install_default_skills(): click.echo("Default Skills Installed") +@neon_core_cli.command(help="Ensure default resource files are available") +def update_default_resources(): + from neon_core.util.skill_utils import update_default_resources + click.echo("Updating Default Resources") + update_default_resources() + # @neon_core_cli.command(help= # "Install skill requirements for a specified directory") # @click.argument("skill_dir") @@ -102,6 +108,9 @@ def run_skills(install_skills): from neon_utils.configuration_utils import init_config_dir init_config_dir() + from neon_core.util.skill_utils import update_default_resources + update_default_resources() + # from neon_core.util.skill_utils import install_local_skills from neon_core.skills.__main__ import main if install_skills: diff --git a/neon_core/configuration/neon.yaml b/neon_core/configuration/neon.yaml index 5f3f46920..5b6e5bce6 100644 --- a/neon_core/configuration/neon.yaml +++ b/neon_core/configuration/neon.yaml @@ -263,6 +263,8 @@ ignore_logs: - enclosure.mouth.viseme - enclosure.mouth.display +data_dir: ~/.cache/neon/res + # Backwards-compat semi-deprecated precise: use_precise: true diff --git a/neon_core/res/text/uk-ua/skill.error.dialog b/neon_core/res/text/uk-ua/skill.error.dialog new file mode 100644 index 000000000..0632549b5 --- /dev/null +++ b/neon_core/res/text/uk-ua/skill.error.dialog @@ -0,0 +1 @@ +Виникла помилка під час обробки запиту в {{skill}}. \ No newline at end of file diff --git a/neon_core/util/skill_utils.py b/neon_core/util/skill_utils.py index 990d3970d..ca7432705 100644 --- a/neon_core/util/skill_utils.py +++ b/neon_core/util/skill_utils.py @@ -31,14 +31,13 @@ import re from copy import copy -from os import listdir, makedirs +from os import listdir, makedirs, symlink from tempfile import mkdtemp from shutil import rmtree -from os.path import expanduser, join, isdir, dirname +from os.path import expanduser, join, isdir, dirname, islink from typing import List from ovos_utils.xdg_utils import xdg_data_home -from ovos_skill_installer import download_extract_zip from ovos_utils.log import LOG, log_deprecation from ovos_config.config import Configuration @@ -51,11 +50,12 @@ def get_neon_skills_data(skill_meta_repository: str = """ Get skill data from configured neon_skills repository. :param skill_meta_repository: URL of skills repository containing metadata - :param branch: branch of repository to checkout + :param branch: branch of repository to check out :param repo_metadata_path: Path to repo directory containing json metadata files """ log_deprecation("This skill repository format is deprecated; specify skills as packages") from ovos_skills_manager.github import normalize_github_url, download_url_from_github_url + from ovos_skill_installer import download_extract_zip skills_data = dict() temp_download_dir = mkdtemp() zip_url = download_url_from_github_url(skill_meta_repository, branch) @@ -229,3 +229,26 @@ def _get_skills_from_remote_list(url: str) -> List[str]: LOG.error(f"Unable to fetch skills list from: {url} ({resp.status_code})") return [] return [s for s in resp.text.split("\n") if s.strip() and not s.startswith('#')] + + +def update_default_resources(): + """ + Ensure the `res` directory contents are available at the configured data_dir + """ + res_dir = Configuration().get('data_dir') + if not res_dir: + LOG.info("`data_dir` is None; not linking default resources.") + return + res_dir = expanduser(res_dir) + if isdir(res_dir): + LOG.info(f"Directory exists; not linking default resources. {res_dir}") + return + if islink(res_dir): + LOG.debug(f"Link exists; not doing anything.") + return + if not isdir(dirname(res_dir)): + # Ensure directory exists to link default resources in + makedirs(dirname(res_dir)) + + symlink(join(dirname(dirname(__file__)), "res"), res_dir) + LOG.debug("Updated Neon default resources") diff --git a/requirements/skills_default.txt b/requirements/skills_default.txt index 71e56fcf5..7ebfd5944 100644 --- a/requirements/skills_default.txt +++ b/requirements/skills_default.txt @@ -1,9 +1,9 @@ skill-ddg==0.0.2a3 neon-skill-alerts~=2.0 -neon-skill-caffeinewiz~=1.0 +neon-skill-caffeinewiz~=1.0,>=1.0.1a2 neon-skill-data_controls~=2.0 neon-skill-fallback_wolfram_alpha~=1.0 -neon-skill-personal~=1.0 +neon-skill-personal~=1.0,>=1.0.1a2 neon-skill-speak~=2.0 neon-skill-speed_test~=1.0,>=1.0.1 neon-skill-spelling~=1.0 diff --git a/test/test_skill_utils.py b/test/test_skill_utils.py index cfcd60bc0..9be227c52 100644 --- a/test/test_skill_utils.py +++ b/test/test_skill_utils.py @@ -30,7 +30,8 @@ import shutil import sys import unittest - +from os.path import dirname, join, exists, isdir +from unittest.mock import patch sys.path.append(os.path.dirname(os.path.dirname(__file__))) @@ -97,17 +98,21 @@ def test_install_skills_from_list_with_auth(self): self.assertEqual(len(skill_dirs), len(TEST_SKILLS_WITH_AUTH)) self.assertIn("i-like-brands.neon.neongeckocom", skill_dirs) - def test_install_skills_default(self): + @patch("neon_core.util.skill_utils.install_skills_from_list") + def test_install_skills_default(self, install_skills): from neon_core.util.skill_utils import install_skills_default,\ _get_skills_from_remote_list install_skills_default(SKILL_CONFIG) - skill_dirs = [d for d in os.listdir(SKILL_DIR) if - os.path.isdir(os.path.join(SKILL_DIR, d))] - self.assertEqual( - len(skill_dirs), - len(_get_skills_from_remote_list(SKILL_CONFIG["default_skills"])), - f"{skill_dirs}\n\n" - f"{_get_skills_from_remote_list(SKILL_CONFIG['default_skills'])}") + expected = _get_skills_from_remote_list(SKILL_CONFIG["default_skills"]) + install_skills.assert_called_once_with(expected, + install_skills.call_args[0][1]) + # skill_dirs = [d for d in os.listdir(SKILL_DIR) if + # os.path.isdir(os.path.join(SKILL_DIR, d))] + # self.assertEqual( + # len(skill_dirs), + # len(_get_skills_from_remote_list(SKILL_CONFIG["default_skills"])), + # f"{skill_dirs}\n\n" + # f"{_get_skills_from_remote_list(SKILL_CONFIG['default_skills'])}") def test_install_skills_with_pip(self): from neon_core.util.skill_utils import install_skills_from_list @@ -243,6 +248,30 @@ def test_skill_class_patches(self): # # Class added in ovos-workwhop 0.0.12 # pass + @patch("neon_core.util.skill_utils.Configuration") + def test_update_default_resources(self, config): + from neon_core.util.skill_utils import update_default_resources + mock_config = {"data_dir": join(dirname(__file__), "test_resources", + "res")} + config.return_value = mock_config + + # Valid create resource path + update_default_resources() + self.assertTrue(exists(mock_config['data_dir'])) + self.assertTrue(isdir(join(mock_config['data_dir'], "text", "uk-ua"))) + + # Valid path already exists + update_default_resources() + self.assertTrue(exists(mock_config['data_dir'])) + self.assertTrue(isdir(join(mock_config['data_dir'], "text", "uk-ua"))) + + os.remove(mock_config['data_dir']) + + # Invalid path already exists + mock_config['data_dir'] = dirname(__file__) + update_default_resources() + self.assertFalse(isdir(join(mock_config['data_dir'], "text", "uk-ua"))) + if __name__ == '__main__': unittest.main() From dad49d2818ad5382b377c9279f2e77eba45b6691 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Tue, 9 Jan 2024 02:39:51 +0000 Subject: [PATCH 10/45] Increment Version to 24.1.9a5 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index 7cabe7227..a6f7ea33f 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.1.5a4" +__version__ = "24.1.9a5" From dd50b04752fb6bd06dd8312a9f325f0ea6ffd118 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Tue, 9 Jan 2024 12:11:26 -0800 Subject: [PATCH 11/45] Update HomeAssistant skill and plugin (#604) Co-authored-by: Daniel McKnight --- requirements/pi.txt | 2 +- requirements/skills_extended.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/pi.txt b/requirements/pi.txt index cade61db8..48922913e 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -46,7 +46,7 @@ ovos-phal-plugin-oauth~=0.0.2,>=0.0.3a2 ovos-phal-plugin-alsa~=0.0.3 ovos-phal-plugin-system~=0.0.4 ovos-phal-plugin-connectivity-events~=0.0.3 -ovos-phal-plugin-homeassistant~=0.0.3,>=0.0.4a3 +ovos-phal-plugin-homeassistant~=0.0.3,>=0.0.4a4 ovos-phal-plugin-wallpaper-manager~=0.0.1 ovos-phal-plugin-ipgeo~=0.0.2 # ovos-phal-plugin-gpsd @ git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-gpsd diff --git a/requirements/skills_extended.txt b/requirements/skills_extended.txt index f3b4003c9..61bff1bb2 100644 --- a/requirements/skills_extended.txt +++ b/requirements/skills_extended.txt @@ -8,5 +8,5 @@ neon-skill-synonyms~=1.0,>=1.0.1 neon-skill-translation~=1.0 neon-skill-camera~=1.0 ovos-skill-somafm~=0.0.1 -neon-homeassistant-skill~=0.0.14 +neon-homeassistant-skill~=0.0.15 ovos-skill-jokes @ git+https://github.com/openvoiceos/skill-ovos-icanhazdadjokes@ad20ee400c7195cfdb43596f32b1c0a4293ce941 \ No newline at end of file From 09aef119094c7d656da8273f8f1c1c52dc0d2b25 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Tue, 9 Jan 2024 20:11:42 +0000 Subject: [PATCH 12/45] Increment Version to 24.1.9a6 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index a6f7ea33f..6edb2f82e 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.1.9a5" +__version__ = "24.1.9a6" From 445fc7924580aab7951dc763b122e75167d2db2a Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:35:49 -0800 Subject: [PATCH 13/45] Validate ovos dependency stable releases (#605) Co-authored-by: Daniel McKnight --- requirements/core_modules.txt | 2 +- requirements/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index fadfee081..025a3a282 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -1,5 +1,5 @@ # neon core modules -neon_messagebus~=2.0,>=2.0.1a1 +neon_messagebus~=2.0,>=2.0.1a2 neon_enclosure~=1.6,>=1.6.2a1 neon_speech~=4.3 neon_gui~=1.2,>=1.2.2 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index c08535a5a..c3ff23216 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,7 +1,7 @@ # ovos-core version pinned for compat. with patches in NeonCore ovos-core==0.0.7 # padacioso==0.1.3a2 -ovos-plugin-common-play~=0.0.5,>=0.0.6a13 +ovos-plugin-common-play~=0.0.5,>=0.0.6a15 # TODO: Audio for alpha resolution neon-utils[network,audio]~=1.8,>=1.8.3a2 From 4c57e118d8b554d4e9f96a90a56a37c16a5e0733 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Wed, 10 Jan 2024 19:36:05 +0000 Subject: [PATCH 14/45] Increment Version to 24.1.10a7 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index 6edb2f82e..d58e54e3b 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.1.9a6" +__version__ = "24.1.10a7" From 85cbea7552b8ac3f5b4cafb77109462cae4dcdda Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Thu, 11 Jan 2024 13:32:20 -0800 Subject: [PATCH 15/45] Update dependencies to resolve deprecation warnings (#606) Co-authored-by: Daniel McKnight --- requirements/core_modules.txt | 2 +- requirements/pi.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index 025a3a282..8a6fbd4ca 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -1,5 +1,5 @@ # neon core modules -neon_messagebus~=2.0,>=2.0.1a2 +neon_messagebus~=2.0,>=2.0.1 neon_enclosure~=1.6,>=1.6.2a1 neon_speech~=4.3 neon_gui~=1.2,>=1.2.2 diff --git a/requirements/pi.txt b/requirements/pi.txt index 48922913e..93c44fe9e 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -39,14 +39,14 @@ neon-phal-plugin-fan~=0.1 neon-phal-plugin-switches~=0.0.4 neon-phal-plugin-linear_led~=0.2,>=0.2.2 ovos-phal-plugin-balena-wifi~=1.0.0 -neon-phal-plugin-gui-network-client~=0.0.3 +neon-phal-plugin-gui-network-client~=0.0.3,>=0.0.4a1 ovos-phal-plugin-network-manager~=1.1 -ovos-phal-plugin-wifi-setup~=1.1,>=1.1.1 +ovos-phal-plugin-wifi-setup~=1.1,>=1.1.2a1 ovos-phal-plugin-oauth~=0.0.2,>=0.0.3a2 ovos-phal-plugin-alsa~=0.0.3 -ovos-phal-plugin-system~=0.0.4 +ovos-phal-plugin-system~=0.0.4,>=0.0.5a1 ovos-phal-plugin-connectivity-events~=0.0.3 -ovos-phal-plugin-homeassistant~=0.0.3,>=0.0.4a4 +ovos-phal-plugin-homeassistant~=0.0.3,>=0.0.4a5 ovos-phal-plugin-wallpaper-manager~=0.0.1 ovos-phal-plugin-ipgeo~=0.0.2 # ovos-phal-plugin-gpsd @ git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-gpsd From 42ec6222a7512e0358fbb30b76167f91cb823726 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Thu, 11 Jan 2024 21:32:36 +0000 Subject: [PATCH 16/45] Increment Version to 24.1.11a8 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index d58e54e3b..75551b722 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.1.10a7" +__version__ = "24.1.11a8" From 3840726bf2eca0a2b1de74b7ce62f7e6cd86720d Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:10:03 -0800 Subject: [PATCH 17/45] Allow newer alpha versions for TTS plugins (#608) Co-authored-by: Daniel McKnight --- requirements/pi.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/requirements/pi.txt b/requirements/pi.txt index 93c44fe9e..58c72980d 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -21,12 +21,10 @@ neon-stt-plugin-google-cloud-streaming~=1.0,>=1.0.1 neon-tts-plugin-coqui-remote~=0.0.3 neon-stt-plugin-nemo~=0.0.4 -# ovos-tts-plugin-server~=0.0.0,>=0.0.2a4 -ovos-tts-plugin-server==0.0.2a4 +ovos-tts-plugin-server~=0.0.0,>=0.0.2a4 # Fallback plugins -# neon-tts-plugin-coqui~=0.7,>=0.7.3a4 -neon-tts-plugin-coqui==0.7.3a4 +neon-tts-plugin-coqui~=0.7,>=0.7.3a4 ovos-stt-plugin-vosk~=0.1,>=0.1.4 # PHAL Plugins From 9bbd656fffff542b877f0b7215f6962fe50693b0 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Mon, 22 Jan 2024 19:10:19 +0000 Subject: [PATCH 18/45] Increment Version to 24.1.22a9 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index 75551b722..c8ed57042 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.1.11a8" +__version__ = "24.1.22a9" From 62ac2399000401ddfbe16311f7bbdb08195ddc67 Mon Sep 17 00:00:00 2001 From: David Blencowe Date: Tue, 23 Jan 2024 21:30:38 +0000 Subject: [PATCH 19/45] feat: Adds arm64 docker image builds (#607) Co-authored-by: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> --- .github/workflows/publish_release.yml | 1 + .github/workflows/publish_test_build.yml | 1 + .github/workflows/unit_tests.yml | 2 ++ 3 files changed, 4 insertions(+) diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 2f7d1fcf3..cebc7712b 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -26,3 +26,4 @@ jobs: image_name: ${{ github.repository_owner }}/neon_skills base_tag: base extra_tag: default_skills + platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/publish_test_build.yml b/.github/workflows/publish_test_build.yml index bc36ebfe0..8f6066047 100644 --- a/.github/workflows/publish_test_build.yml +++ b/.github/workflows/publish_test_build.yml @@ -29,3 +29,4 @@ jobs: image_name: ${{ github.repository_owner }}/neon_skills base_tag: base extra_tag: default_skills + platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index f9390bf42..7b8880e13 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -12,6 +12,8 @@ jobs: python_version: "3.8" docker_build_tests: uses: neongeckocom/.github/.github/workflows/docker_build_tests.yml@master + with: + platforms: linux/amd64,linux/arm64 util_tests: strategy: matrix: From b5ce249950622aaef0dbcf5226f872e1930a3a55 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Tue, 23 Jan 2024 21:30:54 +0000 Subject: [PATCH 20/45] Increment Version to 24.1.23a10 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index c8ed57042..62dbd496c 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.1.22a9" +__version__ = "24.1.23a10" From 9a3fb3e470d20d171dbbb638b749fac57583748f Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Thu, 25 Jan 2024 14:47:43 -0800 Subject: [PATCH 21/45] Update audio module dependencies (#609) Co-authored-by: Daniel McKnight --- requirements/core_modules.txt | 2 +- requirements/requirements.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index 8a6fbd4ca..6defcbb91 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -3,4 +3,4 @@ neon_messagebus~=2.0,>=2.0.1 neon_enclosure~=1.6,>=1.6.2a1 neon_speech~=4.3 neon_gui~=1.2,>=1.2.2 -neon_audio~=1.5,>=1.5.1a1 +neon_audio~=1.5,>=1.5.1a3 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index c3ff23216..296b1031e 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,7 +1,6 @@ # ovos-core version pinned for compat. with patches in NeonCore ovos-core==0.0.7 # padacioso==0.1.3a2 -ovos-plugin-common-play~=0.0.5,>=0.0.6a15 # TODO: Audio for alpha resolution neon-utils[network,audio]~=1.8,>=1.8.3a2 From b5061d62a032fbfc9e7ea731f1b2073b48d4e870 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Thu, 25 Jan 2024 22:47:57 +0000 Subject: [PATCH 22/45] Increment Version to 24.1.25a11 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index 62dbd496c..24b4b416b 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.1.23a10" +__version__ = "24.1.25a11" From 778c0237858d4bc23ad3ce9fcb7c81edb4b70d1e Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Fri, 26 Jan 2024 13:50:17 -0800 Subject: [PATCH 23/45] Update IP Address skill for better remote client support (#610) Co-authored-by: Daniel McKnight --- requirements/skills_essential.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/skills_essential.txt b/requirements/skills_essential.txt index f184b5b8b..7be0cc917 100644 --- a/requirements/skills_essential.txt +++ b/requirements/skills_essential.txt @@ -2,4 +2,4 @@ neon-skill-about~=1.0 neon-skill-date_time~=1.0,>=1.0.1a4 neon-skill-demo~=1.0,>=1.0.2 neon-skill-device_controls~=1.0,>=1.0.1a4 -neon-skill-ip_address~=1.1 +neon-skill-ip_address~=1.1,>=1.1.1a2 \ No newline at end of file From 36bc967949ef175238d30240b27dd9f6f8412e9f Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Fri, 26 Jan 2024 21:50:31 +0000 Subject: [PATCH 24/45] Increment Version to 24.1.26a12 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index 24b4b416b..f9815fa98 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.1.25a11" +__version__ = "24.1.26a12" From 25b3273c88e07e834740069573cfe9e097835361 Mon Sep 17 00:00:00 2001 From: David Blencowe Date: Tue, 30 Jan 2024 22:38:55 +0000 Subject: [PATCH 25/45] feat: upgrades dockerfile to python3.10-slim (#612) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1f2b6b5dc..2f7164a4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8-slim as base +FROM python:3.10-slim as base LABEL vendor=neon.ai \ ai.neon.name="neon-skills" From 980d2e1f97fb8e18156cebcced22390321ca34ee Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Tue, 30 Jan 2024 22:39:13 +0000 Subject: [PATCH 26/45] Increment Version to 24.1.30a13 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index f9815fa98..a286c1611 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.1.26a12" +__version__ = "24.1.30a13" From 2830ece72d8f82d83afc88511166fbe5bd304018 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Fri, 2 Feb 2024 19:03:57 -0800 Subject: [PATCH 27/45] Update skills (#613) Co-authored-by: Daniel McKnight --- .github/workflows/setup_tests.yml | 36 +++++++++++++++---------------- requirements/skills_essential.txt | 8 +++---- requirements/skills_extended.txt | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/setup_tests.yml b/.github/workflows/setup_tests.yml index bcae9e53c..0c8b0ad57 100644 --- a/.github/workflows/setup_tests.yml +++ b/.github/workflows/setup_tests.yml @@ -9,7 +9,7 @@ jobs: core_and_skills: strategy: matrix: - python-version: [ 3.7, 3.8, 3.9 ] + python-version: [ 3.8, 3.9, '3.10', '3.11' ] runs-on: ubuntu-latest timeout-minutes: 15 steps: @@ -29,23 +29,23 @@ jobs: - name: Test Skills Installation run: | pip install .[skills_required,skills_essential,skills_default,skills_extended] - pi_image_3_7: - runs-on: ubuntu-latest - timeout-minutes: 90 - steps: - - uses: actions/checkout@v2 - - name: Test chroot installation - uses: pguyot/arm-runner-action@v2 - with: - optimize_image: false - base_image: https://2222.us/app/files/neon_images/pi/debian-base-image-rpi4_2023-02-13_09_05.img.xz - cpu: cortex-a53 - copy_repository_path: /core - commands: | - bash /core/test/pi_setup_3_7.sh || exit 2 - . /core/venv/bin/activate || exit 2 - neon-audio init-plugin -p coqui || exit 2 - neon-speech init-plugin -p neon-stt-plugin-nemo || exit 2 +# pi_image_3_7: +# runs-on: ubuntu-latest +# timeout-minutes: 90 +# steps: +# - uses: actions/checkout@v2 +# - name: Test chroot installation +# uses: pguyot/arm-runner-action@v2 +# with: +# optimize_image: false +# base_image: https://2222.us/app/files/neon_images/pi/debian-base-image-rpi4_2023-02-13_09_05.img.xz +# cpu: cortex-a53 +# copy_repository_path: /core +# commands: | +# bash /core/test/pi_setup_3_7.sh || exit 2 +# . /core/venv/bin/activate || exit 2 +# neon-audio init-plugin -p coqui || exit 2 +# neon-speech init-plugin -p neon-stt-plugin-nemo || exit 2 pi_image_3_10: runs-on: ubuntu-latest timeout-minutes: 90 diff --git a/requirements/skills_essential.txt b/requirements/skills_essential.txt index 7be0cc917..cc5ab5490 100644 --- a/requirements/skills_essential.txt +++ b/requirements/skills_essential.txt @@ -1,5 +1,5 @@ -neon-skill-about~=1.0 -neon-skill-date_time~=1.0,>=1.0.1a4 +neon-skill-about~=1.0,>=1.0.1a1 +neon-skill-date_time~=1.0,>=1.0.1a6 neon-skill-demo~=1.0,>=1.0.2 -neon-skill-device_controls~=1.0,>=1.0.1a4 -neon-skill-ip_address~=1.1,>=1.1.1a2 \ No newline at end of file +neon-skill-device_controls~=1.0,>=1.0.1a5 +neon-skill-ip_address~=1.1,>=1.1.1a3 \ No newline at end of file diff --git a/requirements/skills_extended.txt b/requirements/skills_extended.txt index 61bff1bb2..c04fd2f5d 100644 --- a/requirements/skills_extended.txt +++ b/requirements/skills_extended.txt @@ -8,5 +8,5 @@ neon-skill-synonyms~=1.0,>=1.0.1 neon-skill-translation~=1.0 neon-skill-camera~=1.0 ovos-skill-somafm~=0.0.1 -neon-homeassistant-skill~=0.0.15 +neon-homeassistant-skill~=0.0.16 ovos-skill-jokes @ git+https://github.com/openvoiceos/skill-ovos-icanhazdadjokes@ad20ee400c7195cfdb43596f32b1c0a4293ce941 \ No newline at end of file From 629892e655713feddeb3a70066d3985ae9cd294a Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Sat, 3 Feb 2024 03:04:09 +0000 Subject: [PATCH 28/45] Increment Version to 24.2.3a14 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index a286c1611..e91572c1c 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.1.30a13" +__version__ = "24.2.3a14" From af88efededeb355cb467678654522c30cfaa0f33 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Mon, 5 Feb 2024 19:27:13 -0800 Subject: [PATCH 29/45] Update skills to latest alpha versions (#614) Co-authored-by: Daniel McKnight --- requirements/docker.txt | 3 +++ requirements/pi.txt | 7 +++++-- requirements/skills_default.txt | 30 +++++++++++++++--------------- requirements/skills_extended.txt | 14 +++++++------- 4 files changed, 30 insertions(+), 24 deletions(-) diff --git a/requirements/docker.txt b/requirements/docker.txt index d00ad5b2b..19d70ce88 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -3,3 +3,6 @@ ovos-tts-plugin-mimic # "Lite" homescreen disables edge-device functionality ovos-skill-homescreen-lite @ git+https://github.com/openvoiceos/skill-homescreen-lite + +# TODO: Pinned to resolve install issue with PyICU introduced in 0.0.0a51 +ovos-classifiers==0.0.0a50 \ No newline at end of file diff --git a/requirements/pi.txt b/requirements/pi.txt index 58c72980d..bfcb51d50 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -51,13 +51,16 @@ ovos-phal-plugin-ipgeo~=0.0.2 ovos-gui-plugin-shell-companion~=0.0.0,>=0.0.1a4 # Pi-specific skills -neon-skill-core_ready~=0.0.1 -neon-skill-update~=2.1,>=2.1.2 +neon-skill-core_ready~=0.0.1,>=0.0.2a1 +neon-skill-update~=2.1,>=2.1.3a1 # ovos-skill-homescreen~=0.0.2,>=0.0.3a6 ovos-skill-homescreen==0.0.3a6 # ovos-skill-setup~=0.0.1 ovos-skill-volume~=0.0.1 skill-markII-audio-receiver~=0.1 +# TODO: Pinned to resolve install issue with PyICU introduced in 0.0.0a51 +ovos-classifiers==0.0.0a50 + # Backwards-compat ovos-skills-manager~=0.0.13 # TODO: Remove in 2024 diff --git a/requirements/skills_default.txt b/requirements/skills_default.txt index 7ebfd5944..0a589e987 100644 --- a/requirements/skills_default.txt +++ b/requirements/skills_default.txt @@ -1,18 +1,18 @@ skill-ddg==0.0.2a3 -neon-skill-alerts~=2.0 -neon-skill-caffeinewiz~=1.0,>=1.0.1a2 -neon-skill-data_controls~=2.0 -neon-skill-fallback_wolfram_alpha~=1.0 -neon-skill-personal~=1.0,>=1.0.1a2 -neon-skill-speak~=2.0 -neon-skill-speed_test~=1.0,>=1.0.1 -neon-skill-spelling~=1.0 -neon-skill-stock~=1.0 -neon-skill-support_helper~=1.2,>=1.2.1 -neon-skill-user_settings~=1.0,>=1.0.4 -neon-skill-weather~=1.0,>=1.0.1 +neon-skill-alerts~=2.0,>=2.0.1a3 +neon-skill-caffeinewiz~=1.0,>=1.0.1a4 +neon-skill-data_controls~=2.0,>=2.0.1a2 +neon-skill-fallback_wolfram_alpha~=1.0,>=1.0.1a1 +neon-skill-personal~=1.0,>=1.0.1a3 +neon-skill-speak~=2.0,>=2.0.1a1 +neon-skill-speed_test~=1.0,>=1.0.2a1 +neon-skill-spelling~=1.0,>=1.0.1a1 +neon-skill-stock~=1.0,>=1.0.1a1 +neon-skill-support_helper~=1.2,>=1.2.2a1 +neon-skill-user_settings~=1.0,>=1.0.5a2 +neon-skill-weather~=1.0,>=1.0.2a1 neon-skill-wikipedia~=1.0,>=1.0.1 -neon-skill-free_music_archive~=1.0 -neon-skill-local_music~=2.0 +neon-skill-free_music_archive~=1.0,>=1.0.1a1 +neon-skill-local_music~=2.0,>=2.0.1a1 # neon-skill-holidays~=0.0.0a1 -neon-skill-fallback_llm~=1.0,>=1.0.2a1 +neon-skill-fallback_llm~=1.0,>=1.0.2a2 diff --git a/requirements/skills_extended.txt b/requirements/skills_extended.txt index c04fd2f5d..cac0f02ad 100644 --- a/requirements/skills_extended.txt +++ b/requirements/skills_extended.txt @@ -1,12 +1,12 @@ -neon-skill-audio_record~=1.0 +neon-skill-audio_record~=1.0,>=1.0.1a1 # neon-skill-custom_conversation>=0.0.1a8,<0.0.2 -neon-skill-instructions~=0.1 -neon-skill-launcher~=1.0 +neon-skill-instructions~=0.1,>=0.1.1a3 +neon-skill-launcher~=1.0,>=1.0.1a1 skill-news~=0.0.3 -# neon-skill-recipes>=0.0.1a7 -neon-skill-synonyms~=1.0,>=1.0.1 -neon-skill-translation~=1.0 -neon-skill-camera~=1.0 +# neon-skill-recipes>=0.0.1a8 +neon-skill-synonyms~=1.0,>=1.0.2a1 +neon-skill-translation~=1.0,>=1.0.1a2 +neon-skill-camera~=1.0,>=1.0.1a1 ovos-skill-somafm~=0.0.1 neon-homeassistant-skill~=0.0.16 ovos-skill-jokes @ git+https://github.com/openvoiceos/skill-ovos-icanhazdadjokes@ad20ee400c7195cfdb43596f32b1c0a4293ce941 \ No newline at end of file From ec19440a5411d53340b012910a96da532bf9bc9e Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Tue, 6 Feb 2024 03:27:27 +0000 Subject: [PATCH 30/45] Increment Version to 24.2.6a15 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index e91572c1c..480768b12 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.2.3a14" +__version__ = "24.2.6a15" From 8f4767e8b7444a80e0608abfcf1585defcc75a66 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Wed, 7 Feb 2024 09:24:03 -0800 Subject: [PATCH 31/45] Normalize extra dependency names per PEP503 (#615) Co-authored-by: Daniel McKnight --- setup.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index ae63191bd..776c5347a 100644 --- a/setup.py +++ b/setup.py @@ -79,7 +79,6 @@ def get_requirements(requirements_filename: str): long_description_content_type="text/markdown", install_requires=get_requirements('requirements.txt'), extras_require={ - "core_modules": get_requirements("core_modules.txt"), "client": get_requirements("client.txt"), "server": get_requirements("server.txt"), "dev": get_requirements("dev.txt"), @@ -89,10 +88,18 @@ 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") + "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"), + "skills-default": get_requirements("skills_default.txt"), + "skills-extended": get_requirements("skills_extended.txt"), }, packages=find_packages(include=['neon_core*']), package_data={'neon_core': ['res/precise_models/*', 'res/snd/*', From 37a4189b8c507c7bcf73a0ceb3b0d3a1d0b0b6dc Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Wed, 7 Feb 2024 17:24:17 +0000 Subject: [PATCH 32/45] Increment Version to 24.2.7a16 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index 480768b12..cb5e35523 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.2.6a15" +__version__ = "24.2.7a16" From 361c7a5de34d4055f5d9ae72d8aab6dcb1cf17fb Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Wed, 7 Feb 2024 17:40:39 -0800 Subject: [PATCH 33/45] Update wiki and synonyms skills (#616) Co-authored-by: Daniel McKnight --- requirements/skills_default.txt | 2 +- requirements/skills_extended.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/skills_default.txt b/requirements/skills_default.txt index 0a589e987..1d8155665 100644 --- a/requirements/skills_default.txt +++ b/requirements/skills_default.txt @@ -11,7 +11,7 @@ neon-skill-stock~=1.0,>=1.0.1a1 neon-skill-support_helper~=1.2,>=1.2.2a1 neon-skill-user_settings~=1.0,>=1.0.5a2 neon-skill-weather~=1.0,>=1.0.2a1 -neon-skill-wikipedia~=1.0,>=1.0.1 +neon-skill-wikipedia~=1.0,>=1.0.2a1 neon-skill-free_music_archive~=1.0,>=1.0.1a1 neon-skill-local_music~=2.0,>=2.0.1a1 # neon-skill-holidays~=0.0.0a1 diff --git a/requirements/skills_extended.txt b/requirements/skills_extended.txt index cac0f02ad..ac877046e 100644 --- a/requirements/skills_extended.txt +++ b/requirements/skills_extended.txt @@ -4,7 +4,7 @@ neon-skill-instructions~=0.1,>=0.1.1a3 neon-skill-launcher~=1.0,>=1.0.1a1 skill-news~=0.0.3 # neon-skill-recipes>=0.0.1a8 -neon-skill-synonyms~=1.0,>=1.0.2a1 +neon-skill-synonyms~=1.0,>=1.0.2a2 neon-skill-translation~=1.0,>=1.0.1a2 neon-skill-camera~=1.0,>=1.0.1a1 ovos-skill-somafm~=0.0.1 From 1b0d72b785b9a807a2e9e93256d23d7b63570681 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Thu, 8 Feb 2024 01:40:54 +0000 Subject: [PATCH 34/45] Increment Version to 24.2.8a17 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index cb5e35523..5d4ec2355 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.2.7a16" +__version__ = "24.2.8a17" From bfb66848d772a6969c4d6af54fbbb693ad236411 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:16:01 -0800 Subject: [PATCH 35/45] Add support for Mark1 enclosure (#617) Co-authored-by: Daniel McKnight --- neon_core/configuration/mark_2/neon.yaml | 2 ++ requirements/pi.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/neon_core/configuration/mark_2/neon.yaml b/neon_core/configuration/mark_2/neon.yaml index c1299ac7c..e7402bc89 100644 --- a/neon_core/configuration/mark_2/neon.yaml +++ b/neon_core/configuration/mark_2/neon.yaml @@ -91,6 +91,8 @@ skills: - skill-audio_record.neongeckocom default_skills: [] PHAL: + ovos-PHAL-plugin-mk1: + enabled: false ovos-PHAL-plugin-balena-wifi: enabled: false debug: false diff --git a/requirements/pi.txt b/requirements/pi.txt index bfcb51d50..dbebfd255 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -47,6 +47,8 @@ ovos-phal-plugin-connectivity-events~=0.0.3 ovos-phal-plugin-homeassistant~=0.0.3,>=0.0.4a5 ovos-phal-plugin-wallpaper-manager~=0.0.1 ovos-phal-plugin-ipgeo~=0.0.2 +ovos-phal-plugin-mk1 @ git+https://github.com/openvoiceos/ovos-phal-plugin-mk1@dev +# TODO: Stable spec for mk1 plugin # ovos-phal-plugin-gpsd @ git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-gpsd ovos-gui-plugin-shell-companion~=0.0.0,>=0.0.1a4 From 8f52896b253021bc1c26dae6604a0cbb4555cd71 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Tue, 13 Feb 2024 23:16:17 +0000 Subject: [PATCH 36/45] Increment Version to 24.2.13a18 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index 5d4ec2355..d6eafe1b6 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.2.8a17" +__version__ = "24.2.13a18" From 675edaa62f085863cc86cb5f6c1109d15043a144 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Thu, 22 Feb 2024 13:09:31 -0800 Subject: [PATCH 37/45] Update alerts skill (#611) Co-authored-by: Daniel McKnight --- requirements/skills_default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/skills_default.txt b/requirements/skills_default.txt index 1d8155665..4916c8251 100644 --- a/requirements/skills_default.txt +++ b/requirements/skills_default.txt @@ -1,5 +1,5 @@ skill-ddg==0.0.2a3 -neon-skill-alerts~=2.0,>=2.0.1a3 +neon-skill-alerts~=2.0,>=2.0.1a4 neon-skill-caffeinewiz~=1.0,>=1.0.1a4 neon-skill-data_controls~=2.0,>=2.0.1a2 neon-skill-fallback_wolfram_alpha~=1.0,>=1.0.1a1 From a07e314092367dff6af0ca86ff630fe29549de60 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Thu, 22 Feb 2024 21:09:55 +0000 Subject: [PATCH 38/45] Increment Version to 24.2.22a19 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index d6eafe1b6..18d81fd08 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.2.13a18" +__version__ = "24.2.22a19" From 7a5e1ae57d90efe11d333ac74e598a7767f9f1f8 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Mon, 26 Feb 2024 12:25:25 -0800 Subject: [PATCH 39/45] Remove alpha dependencies to validate stable release (#618) Co-authored-by: Daniel McKnight --- requirements/core_modules.txt | 6 ++--- requirements/docker.txt | 3 --- requirements/local_speech_processing.txt | 2 +- requirements/pi.txt | 28 ++++++++++----------- requirements/requirements.txt | 13 +++++----- requirements/skills_default.txt | 32 ++++++++++++------------ requirements/skills_essential.txt | 8 +++--- requirements/skills_extended.txt | 12 ++++----- 8 files changed, 50 insertions(+), 54 deletions(-) diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index 6defcbb91..1c51ea491 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -1,6 +1,6 @@ # neon core modules neon_messagebus~=2.0,>=2.0.1 -neon_enclosure~=1.6,>=1.6.2a1 -neon_speech~=4.3 +neon_enclosure==1.6.2 # TODO: This is a yanked release because it depends on an alpha ovos-backend-client +neon_speech~=4.3 #,>=4.3.1a2 neon_gui~=1.2,>=1.2.2 -neon_audio~=1.5,>=1.5.1a3 +neon_audio~=1.5,>=1.5.1 diff --git a/requirements/docker.txt b/requirements/docker.txt index 19d70ce88..d00ad5b2b 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -3,6 +3,3 @@ ovos-tts-plugin-mimic # "Lite" homescreen disables edge-device functionality ovos-skill-homescreen-lite @ git+https://github.com/openvoiceos/skill-homescreen-lite - -# TODO: Pinned to resolve install issue with PyICU introduced in 0.0.0a51 -ovos-classifiers==0.0.0a50 \ No newline at end of file diff --git a/requirements/local_speech_processing.txt b/requirements/local_speech_processing.txt index 60404edfa..36a9b6cc3 100644 --- a/requirements/local_speech_processing.txt +++ b/requirements/local_speech_processing.txt @@ -1,6 +1,6 @@ neon-stt-plugin-deepspeech-stream-local~=2.0 neon-stt-plugin-nemo~=0.0 -neon-tts-plugin-coqui~=0.7,>=0.7.3a4 +neon-tts-plugin-coqui~=0.8 onnxruntime!=1.16.0 # TODO: Patching https://github.com/microsoft/onnxruntime/issues/17631 # TODO: Local language plugin diff --git a/requirements/pi.txt b/requirements/pi.txt index dbebfd255..f7c85b146 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -21,7 +21,7 @@ neon-stt-plugin-google-cloud-streaming~=1.0,>=1.0.1 neon-tts-plugin-coqui-remote~=0.0.3 neon-stt-plugin-nemo~=0.0.4 -ovos-tts-plugin-server~=0.0.0,>=0.0.2a4 +ovos-tts-plugin-server==0.0.2a12 # Fallback plugins neon-tts-plugin-coqui~=0.7,>=0.7.3a4 @@ -37,32 +37,30 @@ neon-phal-plugin-fan~=0.1 neon-phal-plugin-switches~=0.0.4 neon-phal-plugin-linear_led~=0.2,>=0.2.2 ovos-phal-plugin-balena-wifi~=1.0.0 -neon-phal-plugin-gui-network-client~=0.0.3,>=0.0.4a1 +neon-phal-plugin-gui-network-client~=0.0.4 ovos-phal-plugin-network-manager~=1.1 -ovos-phal-plugin-wifi-setup~=1.1,>=1.1.2a1 -ovos-phal-plugin-oauth~=0.0.2,>=0.0.3a2 +ovos-phal-plugin-wifi-setup==1.1.2a1 +ovos-phal-plugin-oauth==0.0.3a2 ovos-phal-plugin-alsa~=0.0.3 -ovos-phal-plugin-system~=0.0.4,>=0.0.5a1 +ovos-phal-plugin-system~=0.0.4 #,>=0.0.5a1 ovos-phal-plugin-connectivity-events~=0.0.3 -ovos-phal-plugin-homeassistant~=0.0.3,>=0.0.4a5 +ovos-phal-plugin-homeassistant~=0.0.3 #,>=0.0.4a5 ovos-phal-plugin-wallpaper-manager~=0.0.1 ovos-phal-plugin-ipgeo~=0.0.2 -ovos-phal-plugin-mk1 @ git+https://github.com/openvoiceos/ovos-phal-plugin-mk1@dev +# ovos-phal-plugin-mk1 @ git+https://github.com/openvoiceos/ovos-phal-plugin-mk1@dev # TODO: Stable spec for mk1 plugin # ovos-phal-plugin-gpsd @ git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-gpsd -ovos-gui-plugin-shell-companion~=0.0.0,>=0.0.1a4 +ovos-gui-plugin-shell-companion==0.0.1a5 # Pi-specific skills -neon-skill-core_ready~=0.0.1,>=0.0.2a1 -neon-skill-update~=2.1,>=2.1.3a1 -# ovos-skill-homescreen~=0.0.2,>=0.0.3a6 -ovos-skill-homescreen==0.0.3a6 +neon-skill-core_ready~=0.0.1 #,>=0.0.2a1 +neon-skill-update~=2.1 #,>=2.1.3a1 +# ovos-skill-homescreen~=0.0.2,>=0.0.3a16 +ovos-skill-homescreen==0.0.3a16 + # ovos-skill-setup~=0.0.1 ovos-skill-volume~=0.0.1 skill-markII-audio-receiver~=0.1 -# TODO: Pinned to resolve install issue with PyICU introduced in 0.0.0a51 -ovos-classifiers==0.0.0a50 - # Backwards-compat ovos-skills-manager~=0.0.13 # TODO: Remove in 2024 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 296b1031e..691126e04 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -2,15 +2,16 @@ ovos-core==0.0.7 # padacioso==0.1.3a2 -# TODO: Audio for alpha resolution -neon-utils[network,audio]~=1.8,>=1.8.3a2 +# # TODO: Audio for alpha resolution +neon-utils[network,audio]~=1.8,>=1.8.3a5 ovos-utils~=0.0.38 ovos-bus-client~=0.0.8 neon-transformers~=0.2 ovos-config~=0.0.12 ovos-plugin-manager~=0.0.25 -ovos-backend-client~=0.1,>=0.1.1a2 +# ovos-backend-client~=0.1,>=0.1.1a2 +ovos-backend-client==0.1.1a5 # TODO psutil~=5.6 click~=8.0 @@ -24,14 +25,14 @@ neon-lang-plugin-libretranslate~=0.2 neon-utterance-translator-plugin~=0.2 neon-utterance-normalizer-plugin~=0.1 -# TODO: Patching test failures https://github.com/NeonGeckoCom/NeonCore/actions/runs/4888865255/jobs/8727164992?pr=422 -requests < 2.30.0 +requests~=2.29 # TODO: Patching dependencies ovos-core[skills,skills_lgpl] extra deps adapt-parser~=0.5 padacioso~=0.1 -ovos-lingua-franca~=0.4.8a7 +ovos-lingua-franca==0.4.8a7 # TODO +ovos-classifiers==0.0.0a53 # TODO ovos-phal-plugin-connectivity-events~=0.0.1 padatious~=0.4.8 fann2==1.0.7 diff --git a/requirements/skills_default.txt b/requirements/skills_default.txt index 4916c8251..4087962fc 100644 --- a/requirements/skills_default.txt +++ b/requirements/skills_default.txt @@ -1,18 +1,18 @@ skill-ddg==0.0.2a3 -neon-skill-alerts~=2.0,>=2.0.1a4 -neon-skill-caffeinewiz~=1.0,>=1.0.1a4 -neon-skill-data_controls~=2.0,>=2.0.1a2 -neon-skill-fallback_wolfram_alpha~=1.0,>=1.0.1a1 -neon-skill-personal~=1.0,>=1.0.1a3 -neon-skill-speak~=2.0,>=2.0.1a1 -neon-skill-speed_test~=1.0,>=1.0.2a1 -neon-skill-spelling~=1.0,>=1.0.1a1 -neon-skill-stock~=1.0,>=1.0.1a1 -neon-skill-support_helper~=1.2,>=1.2.2a1 -neon-skill-user_settings~=1.0,>=1.0.5a2 -neon-skill-weather~=1.0,>=1.0.2a1 -neon-skill-wikipedia~=1.0,>=1.0.2a1 -neon-skill-free_music_archive~=1.0,>=1.0.1a1 -neon-skill-local_music~=2.0,>=2.0.1a1 +neon-skill-alerts~=2.0 #,>=2.0.1a4 +neon-skill-caffeinewiz~=1.0 #,>=1.0.1a4 +neon-skill-data_controls~=2.0 #,>=2.0.1a2 +neon-skill-fallback_wolfram_alpha~=1.0 #,>=1.0.1a1 +neon-skill-personal~=1.0 #,>=1.0.1a3 +neon-skill-speak~=2.0 #,>=2.0.1a1 +neon-skill-speed_test~=1.0,>=1.0.1 #,>=1.0.2a1 +neon-skill-spelling~=1.0 #,>=1.0.1a1 +neon-skill-stock~=1.0 #,>=1.0.1a1 +neon-skill-support_helper~=1.2,>=1.2.1 #,>=1.2.2a1 +neon-skill-user_settings~=1.0 #,>=1.0.5a2 +neon-skill-weather~=1.0,>=1.0.1 #,>=1.0.2a1 +neon-skill-wikipedia~=1.0,>=1.0.1 #,>=1.0.2a1 +neon-skill-free_music_archive~=1.0 #,>=1.0.1a1 +neon-skill-local_music~=2.0 #,>=2.0.1a1 # neon-skill-holidays~=0.0.0a1 -neon-skill-fallback_llm~=1.0,>=1.0.2a2 +neon-skill-fallback_llm~=1.0,>=1.0.1 #,>=1.0.2a2 diff --git a/requirements/skills_essential.txt b/requirements/skills_essential.txt index cc5ab5490..8a9aa5a9c 100644 --- a/requirements/skills_essential.txt +++ b/requirements/skills_essential.txt @@ -1,5 +1,5 @@ -neon-skill-about~=1.0,>=1.0.1a1 -neon-skill-date_time~=1.0,>=1.0.1a6 +neon-skill-about~=1.0 #,>=1.0.1a1 +neon-skill-date_time~=1.0 #,>=1.0.1a6 neon-skill-demo~=1.0,>=1.0.2 -neon-skill-device_controls~=1.0,>=1.0.1a5 -neon-skill-ip_address~=1.1,>=1.1.1a3 \ No newline at end of file +neon-skill-device_controls~=1.0 #,>=1.0.1a5 +neon-skill-ip_address~=1.1 #,>=1.1.1a3 \ No newline at end of file diff --git a/requirements/skills_extended.txt b/requirements/skills_extended.txt index ac877046e..66a8f1eb0 100644 --- a/requirements/skills_extended.txt +++ b/requirements/skills_extended.txt @@ -1,12 +1,12 @@ -neon-skill-audio_record~=1.0,>=1.0.1a1 +neon-skill-audio_record~=1.0 #,>=1.0.1a1 # neon-skill-custom_conversation>=0.0.1a8,<0.0.2 -neon-skill-instructions~=0.1,>=0.1.1a3 -neon-skill-launcher~=1.0,>=1.0.1a1 +neon-skill-instructions~=0.1 #,>=0.1.1a3 +neon-skill-launcher~=1.0 #,>=1.0.1a1 skill-news~=0.0.3 # neon-skill-recipes>=0.0.1a8 -neon-skill-synonyms~=1.0,>=1.0.2a2 -neon-skill-translation~=1.0,>=1.0.1a2 -neon-skill-camera~=1.0,>=1.0.1a1 +neon-skill-synonyms~=1.0, >=1.0.1 #,>=1.0.2a2 +neon-skill-translation~=1.0 #,>=1.0.1a2 +neon-skill-camera~=1.0 #,>=1.0.1a1 ovos-skill-somafm~=0.0.1 neon-homeassistant-skill~=0.0.16 ovos-skill-jokes @ git+https://github.com/openvoiceos/skill-ovos-icanhazdadjokes@ad20ee400c7195cfdb43596f32b1c0a4293ce941 \ No newline at end of file From 000ec5b857678028b30f3295b8d11a6ef50f4507 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Mon, 26 Feb 2024 20:25:57 +0000 Subject: [PATCH 40/45] Increment Version to 24.2.26a20 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index 18d81fd08..a554cf697 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.2.22a19" +__version__ = "24.2.26a20" From 91bba4c93a873beecb70afd17d19eb91f351d413 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Wed, 28 Feb 2024 10:43:26 -0800 Subject: [PATCH 41/45] Update neon-utils to stable version to prep release (#619) Co-authored-by: Daniel McKnight --- requirements/requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 691126e04..e97b50364 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -2,8 +2,7 @@ ovos-core==0.0.7 # padacioso==0.1.3a2 -# # TODO: Audio for alpha resolution -neon-utils[network,audio]~=1.8,>=1.8.3a5 +neon-utils[network]~=1.9 ovos-utils~=0.0.38 ovos-bus-client~=0.0.8 From 88b208c6a201a2e26658119c27b1da74b446e16c Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Wed, 28 Feb 2024 18:43:44 +0000 Subject: [PATCH 42/45] Increment Version to 24.2.28a21 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index a554cf697..f5c3d9d63 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.2.26a20" +__version__ = "24.2.28a21" From 5598ab0c4777b04b01821f189808bf6aa58d6335 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Thu, 29 Feb 2024 12:09:22 -0800 Subject: [PATCH 43/45] Address Stable Release Feedback (#621) Co-authored-by: Daniel McKnight --- neon_core/skills/__init__.py | 1 - requirements/skills_extended.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/neon_core/skills/__init__.py b/neon_core/skills/__init__.py index c65fb0e3d..dc2a88a8a 100644 --- a/neon_core/skills/__init__.py +++ b/neon_core/skills/__init__.py @@ -37,7 +37,6 @@ import ovos_workshop.skills ovos_workshop.skills.mycroft_skill.MycroftSkill = PatchedMycroftSkill -# TODO: Patch OVOS Skill? workshop_modules = ("ovos_workshop.skills.ovos", "ovos_workshop.skills.fallback", "ovos_workshop.skills.common_query_skill", diff --git a/requirements/skills_extended.txt b/requirements/skills_extended.txt index 66a8f1eb0..9d6800703 100644 --- a/requirements/skills_extended.txt +++ b/requirements/skills_extended.txt @@ -8,5 +8,5 @@ neon-skill-synonyms~=1.0, >=1.0.1 #,>=1.0.2a2 neon-skill-translation~=1.0 #,>=1.0.1a2 neon-skill-camera~=1.0 #,>=1.0.1a1 ovos-skill-somafm~=0.0.1 -neon-homeassistant-skill~=0.0.16 +neon-homeassistant-skill==0.0.14 # TODO: Pinned for stable release ovos-skill-jokes @ git+https://github.com/openvoiceos/skill-ovos-icanhazdadjokes@ad20ee400c7195cfdb43596f32b1c0a4293ce941 \ No newline at end of file From ae3ab6559b79b48993f01fbd551ca72db736ac4f Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Thu, 29 Feb 2024 20:09:41 +0000 Subject: [PATCH 44/45] Increment Version to 24.2.29a22 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index f5c3d9d63..e0c6d3d73 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.2.28a21" +__version__ = "24.2.29a22" From 1ab06d5853d2466b4c3d143af7b6b993b984df6d Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Thu, 29 Feb 2024 23:04:31 +0000 Subject: [PATCH 45/45] Increment Version to 24.2.29 --- neon_core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/version.py b/neon_core/version.py index e0c6d3d73..e7672dfc2 100644 --- a/neon_core/version.py +++ b/neon_core/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "24.2.29a22" +__version__ = "24.2.29"