From 7fc749734a8dee4b68ea36ec4a68025819e75230 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 15 Jan 2024 13:00:02 -0800 Subject: [PATCH 1/7] Update to use shared CommonQuery test class --- .github/workflows/skill_tests.yml | 2 +- requirements/test.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/skill_tests.yml b/.github/workflows/skill_tests.yml index 7fad329..94947a5 100644 --- a/.github/workflows/skill_tests.yml +++ b/.github/workflows/skill_tests.yml @@ -11,7 +11,7 @@ jobs: skill_unit_tests: uses: neongeckocom/.github/.github/workflows/skill_tests.yml@master skill_intent_tests: - uses: neongeckocom/.github/.github/workflows/skill_test_intents.yml@master + uses: neongeckocom/.github/.github/workflows/skill_test_intents.yml@FEAT_MinervaIntentTests skill_resource_tests: uses: neongeckocom/.github/.github/workflows/skill_test_resources.yml@master skill_install_tests: diff --git a/requirements/test.txt b/requirements/test.txt index 5e5737f..e03f251 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1 +1,2 @@ -neon-minerva[padatious]~=0.1,>=0.1.1a1 +# neon-minerva[padatious]~=0.1,>=0.1.1a1 +neon-minerva[padatious]@git+https://github.com/neongeckocom/neon-minerva@FEAT_CommonQueryTests \ No newline at end of file From a4f81477443c016d563093bf6e35a6a96759b08b Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 15 Jan 2024 13:06:14 -0800 Subject: [PATCH 2/7] Validate backwards-compat. with action in .github repo --- requirements/test.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements/test.txt b/requirements/test.txt index e03f251..a9e0fdd 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,2 +1 @@ -# neon-minerva[padatious]~=0.1,>=0.1.1a1 -neon-minerva[padatious]@git+https://github.com/neongeckocom/neon-minerva@FEAT_CommonQueryTests \ No newline at end of file +neon-minerva[padatious]~=0.1,>=0.1.1a1 \ No newline at end of file From 95ca29f58283b4d492b5d9e817283317aa89a40b Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 15 Jan 2024 13:17:23 -0800 Subject: [PATCH 3/7] Update minerva to released alpha spec --- requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index a9e0fdd..e3ea10c 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1 +1 @@ -neon-minerva[padatious]~=0.1,>=0.1.1a1 \ No newline at end of file +neon-minerva[padatious]~=0.1,>=0.1.1a3 \ No newline at end of file From eee1f016a227403eef6745db1562add4a53e9226 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 15 Jan 2024 14:58:40 -0800 Subject: [PATCH 4/7] Validate minerva input normalization fix --- requirements/test.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index e3ea10c..aa5a59c 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1 +1,2 @@ -neon-minerva[padatious]~=0.1,>=0.1.1a3 \ No newline at end of file +# neon-minerva[padatious]~=0.1,>=0.1.1a3 +neon-minerva[padatious]@git+https://github.com/neongeckocom/neon-minerva@FIX_InputNormalization From 6691b64fa89cab58d6075a21c9054e4fee639c73 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 15 Jan 2024 15:04:41 -0800 Subject: [PATCH 5/7] Update to resolve test errors --- __init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/__init__.py b/__init__.py index 45f5e78..d033059 100644 --- a/__init__.py +++ b/__init__.py @@ -39,6 +39,7 @@ from bs4 import BeautifulSoup from time import sleep +from lingua_franca import load_language from ovos_bus_client import Message from ovos_utils import classproperty from ovos_utils.log import LOG @@ -82,6 +83,8 @@ def __init__(self, **kwargs): self.from_caffeine_informer = list() self._update_event = Event() CommonQuerySkill.__init__(self, **kwargs) + from neon_utils.signal_utils import init_signal_bus + init_signal_bus(self.bus) @classproperty def runtime_requirements(self): @@ -428,6 +431,7 @@ def _get_new_info(self, reply=False): # Add Normalized drink names def _normalize_drink_list(drink_list): + load_language(self.lang) # Necessary for intent tests for drink in drink_list: try: parsed_name = normalize(drink[0].replace('-', ' '), 'en') From 3ad5d18686ef2a886f582d2fc79a32b17bad63a8 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 15 Jan 2024 15:44:04 -0800 Subject: [PATCH 6/7] Update minerva test dependency to latest version --- requirements/test.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements/test.txt b/requirements/test.txt index aa5a59c..55bb597 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,2 +1 @@ -# neon-minerva[padatious]~=0.1,>=0.1.1a3 -neon-minerva[padatious]@git+https://github.com/neongeckocom/neon-minerva@FIX_InputNormalization +neon-minerva[padatious]~=0.1,>=0.1.1a5 From 079c721cf60d00888293b58670e43906d1366317 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 15 Jan 2024 15:55:16 -0800 Subject: [PATCH 7/7] Update test workflows to default branch --- .github/workflows/skill_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/skill_tests.yml b/.github/workflows/skill_tests.yml index 94947a5..7fad329 100644 --- a/.github/workflows/skill_tests.yml +++ b/.github/workflows/skill_tests.yml @@ -11,7 +11,7 @@ jobs: skill_unit_tests: uses: neongeckocom/.github/.github/workflows/skill_tests.yml@master skill_intent_tests: - uses: neongeckocom/.github/.github/workflows/skill_test_intents.yml@FEAT_MinervaIntentTests + uses: neongeckocom/.github/.github/workflows/skill_test_intents.yml@master skill_resource_tests: uses: neongeckocom/.github/.github/workflows/skill_test_resources.yml@master skill_install_tests: