From 639f1e74048c4cfea3fc093a98558907d5a76d67 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Mon, 15 Jan 2024 15:58:36 -0800 Subject: [PATCH 1/8] Update test dependencies and test case to resolve failures (#106) * Update test dependencies and test case to resolve failures * Test shared test action changes * Update minerva test dependency to latest version * Update test workflows to default branch --------- Co-authored-by: Daniel McKnight --- requirements/test.txt | 2 +- test/test_skill.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/requirements/test.txt b/requirements/test.txt index 42c48e0..55bb597 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1 +1 @@ -neon-minerva[padatious]~=0.1 \ No newline at end of file +neon-minerva[padatious]~=0.1,>=0.1.1a5 diff --git a/test/test_skill.py b/test/test_skill.py index 843c3c4..a95d5b4 100644 --- a/test/test_skill.py +++ b/test/test_skill.py @@ -528,15 +528,17 @@ def test_handle_change_dialog_option(self): def test_handle_say_my_name(self): test_profile = self.user_config test_message = Message("test", {}, - {"username": "test_user", + {"username": "local", "user_profiles": [test_profile]}) - # No name set + # No name set for local user self.skill.handle_say_my_name(test_message) self.skill.speak_dialog.assert_called_with("name_not_known", {"name_position": "name"}, private=True) + # Profile for requesting user set + test_message.context["username"] = "test_user" test_message.context["user_profiles"][0]["user"]["username"] = \ "test_user" # first name not known From 249aa7b6b0d497a7a8d227aa20c57d84bd151f35 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Mon, 15 Jan 2024 23:58:52 +0000 Subject: [PATCH 2/8] Increment Version to 1.0.5a1 --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 39455a3..61b1477 100644 --- a/version.py +++ b/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__ = "1.0.4" +__version__ = "1.0.5a1" From ec23e306d8df66cf2e8185310d74701d24954286 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Mon, 5 Feb 2024 14:34:12 -0800 Subject: [PATCH 3/8] Support ovos-utils 0.1 (#107) * Update requirements to allow ovos-utils 0.1 * Update skill.json --------- Co-authored-by: Daniel McKnight Co-authored-by: NeonDaniel --- requirements.txt | 2 +- skill.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 81785fa..488f729 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ neon-utils[network]~=1.4 -ovos-utils~=0.0.32 +ovos-utils~=0.0, >=0.0.32 ovos-bus-client~=0.0.3 diff --git a/skill.json b/skill.json index c54222b..4f2f865 100644 --- a/skill.json +++ b/skill.json @@ -46,7 +46,7 @@ "python": [ "neon-utils[network]~=1.4", "ovos-bus-client~=0.0.3", - "ovos-utils~=0.0.32" + "ovos-utils~=0.0, >=0.0.32" ], "system": {}, "skill": [] From 716a85fbbba68149d9d2e376760c6b526f59ed68 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Mon, 5 Feb 2024 22:34:29 +0000 Subject: [PATCH 4/8] Increment Version to 1.0.5a2 --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 61b1477..4b8386b 100644 --- a/version.py +++ b/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__ = "1.0.5a1" +__version__ = "1.0.5a2" From c5ffb4d8da0a5541607d96e6a5ae8978a077625b Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Wed, 10 Apr 2024 11:19:25 -0700 Subject: [PATCH 5/8] Update test dependency to stable spec (#109) Fix spelling in docstring Co-authored-by: Daniel McKnight --- __init__.py | 2 +- requirements/test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/__init__.py b/__init__.py index 49a800b..f730a54 100644 --- a/__init__.py +++ b/__init__.py @@ -1073,7 +1073,7 @@ def _get_gender(self, request: str) -> Optional[str]: def _spoken_email(self, email_addr: str): """ - Get a pronouncable email address string + Get a pronounceable email address string """ return email_addr.replace('.', f' {self.translate("word_dot")} ')\ .replace('@', f' {self.translate("word_at")} ') diff --git a/requirements/test.txt b/requirements/test.txt index 55bb597..19363c1 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1 +1 @@ -neon-minerva[padatious]~=0.1,>=0.1.1a5 +neon-minerva[padatious]~=0.2 From 7828cb76df4f832cf25bd3bea6a49f8944888e3c Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Wed, 10 Apr 2024 18:19:43 +0000 Subject: [PATCH 6/8] Increment Version to 1.0.5a3 --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 4b8386b..c587540 100644 --- a/version.py +++ b/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__ = "1.0.5a2" +__version__ = "1.0.5a3" From 2fedfbbf15b8b74ee8ce05e049303b4600e9143f Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Wed, 10 Apr 2024 18:33:02 +0000 Subject: [PATCH 7/8] Increment Version to 1.0.5 --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index c587540..58d0e7e 100644 --- a/version.py +++ b/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__ = "1.0.5a3" +__version__ = "1.0.5" From 0e97658485f7277e8ad45d66e88f30c7241112a5 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Wed, 10 Apr 2024 18:35:02 +0000 Subject: [PATCH 8/8] Update Changelog --- CHANGELOG.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e393f65..5a104bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,28 +1,28 @@ # Changelog -## [1.0.4a3](https://github.com/NeonGeckoCom/skill-user_settings/tree/1.0.4a3) (2023-12-16) +## [1.0.5a3](https://github.com/NeonGeckoCom/skill-user_settings/tree/1.0.5a3) (2024-04-10) -[Full Changelog](https://github.com/NeonGeckoCom/skill-user_settings/compare/1.0.4a2...1.0.4a3) +[Full Changelog](https://github.com/NeonGeckoCom/skill-user_settings/compare/1.0.5a2...1.0.5a3) **Merged pull requests:** -- Update test dependencies to stable specs [\#104](https://github.com/NeonGeckoCom/skill-user_settings/pull/104) ([NeonDaniel](https://github.com/NeonDaniel)) +- Update test dependency and fix docstring [\#109](https://github.com/NeonGeckoCom/skill-user_settings/pull/109) ([NeonDaniel](https://github.com/NeonDaniel)) -## [1.0.4a2](https://github.com/NeonGeckoCom/skill-user_settings/tree/1.0.4a2) (2023-11-20) +## [1.0.5a2](https://github.com/NeonGeckoCom/skill-user_settings/tree/1.0.5a2) (2024-02-05) -[Full Changelog](https://github.com/NeonGeckoCom/skill-user_settings/compare/1.0.4a1...1.0.4a2) +[Full Changelog](https://github.com/NeonGeckoCom/skill-user_settings/compare/1.0.5a1...1.0.5a2) **Merged pull requests:** -- Feat catch unlikely long names [\#103](https://github.com/NeonGeckoCom/skill-user_settings/pull/103) ([NeonDaniel](https://github.com/NeonDaniel)) +- Support ovos-utils 0.1 [\#107](https://github.com/NeonGeckoCom/skill-user_settings/pull/107) ([NeonDaniel](https://github.com/NeonDaniel)) -## [1.0.4a1](https://github.com/NeonGeckoCom/skill-user_settings/tree/1.0.4a1) (2023-11-02) +## [1.0.5a1](https://github.com/NeonGeckoCom/skill-user_settings/tree/1.0.5a1) (2024-01-15) -[Full Changelog](https://github.com/NeonGeckoCom/skill-user_settings/compare/1.0.3...1.0.4a1) +[Full Changelog](https://github.com/NeonGeckoCom/skill-user_settings/compare/1.0.4...1.0.5a1) **Merged pull requests:** -- Remove username example from README [\#102](https://github.com/NeonGeckoCom/skill-user_settings/pull/102) ([strugee](https://github.com/strugee)) +- Update test dependencies and test case to resolve failures [\#106](https://github.com/NeonGeckoCom/skill-user_settings/pull/106) ([NeonDaniel](https://github.com/NeonDaniel))