From 39019d58a46dccbaf27a19aacf0d38c3ffd8177e Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 15 Oct 2024 23:19:19 +0100 Subject: [PATCH 1/6] fix:requirements.txt (#76) cant allow workshop 1.0.0 until #75 is closed --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f6b6a58e..ccf71889 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ requests>=2.31.0 pytz ovos-utils>=0.0.28 -ovos-workshop>=0.0.16,<2.0.0 +ovos-workshop>=0.0.16,<1.0.0 From cbbac86f770133bb627e9e3202aa82a14c8766d7 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 15 Oct 2024 22:19:33 +0000 Subject: [PATCH 2/6] Increment Version to 0.1.2a1 --- version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.py b/version.py index bbc2a727..03493443 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 1 -VERSION_BUILD = 1 -VERSION_ALPHA = 0 +VERSION_BUILD = 2 +VERSION_ALPHA = 1 # END_VERSION_BLOCK From 9ba6c29d33ef8fb4e17f29119dd6a933d0fd481b Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 15 Oct 2024 22:19:55 +0000 Subject: [PATCH 3/6] Update Changelog --- CHANGELOG.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ba5b1e9..bda8ae50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,12 @@ # Changelog -## [0.1.1a2](https://github.com/OpenVoiceOS/skill-ovos-weather/tree/0.1.1a2) (2024-10-15) +## [0.1.2a1](https://github.com/OpenVoiceOS/skill-ovos-weather/tree/0.1.2a1) (2024-10-15) -[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-weather/compare/V0.0.1...0.1.1a2) +[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-weather/compare/0.1.1...0.1.2a1) **Merged pull requests:** -- fix:long description [\#73](https://github.com/OpenVoiceOS/skill-ovos-weather/pull/73) ([JarbasAl](https://github.com/JarbasAl)) -- fix:update\_requirements [\#72](https://github.com/OpenVoiceOS/skill-ovos-weather/pull/72) ([JarbasAl](https://github.com/JarbasAl)) -- Add Catalans strings [\#71](https://github.com/OpenVoiceOS/skill-ovos-weather/pull/71) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app)) +- fix:requirements.txt [\#76](https://github.com/OpenVoiceOS/skill-ovos-weather/pull/76) ([JarbasAl](https://github.com/JarbasAl)) From 342d7eaf55e253716791b9d462f8bcd5af590cb1 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 15 Oct 2024 23:36:51 +0100 Subject: [PATCH 4/6] fix:workshop_100_compat (#78) * fix:workshop_100_compat * fix:workshop_100_compat --- __init__.py | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/__init__.py b/__init__.py index 896fd29b..6e3cc28b 100644 --- a/__init__.py +++ b/__init__.py @@ -1079,7 +1079,7 @@ def get_current_weather_homescreen(self, message=None): low_temperature=weather.daily[0].temperature_low, weather_code=weather.current.condition.code, condition_category=weather.current.condition.category, - condition_description=self.translate( + condition_description=self.resources.render_dialog( weather.current.condition.description ), system_unit=weather_config.scale diff --git a/requirements.txt b/requirements.txt index ccf71889..f6b6a58e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ requests>=2.31.0 pytz ovos-utils>=0.0.28 -ovos-workshop>=0.0.16,<1.0.0 +ovos-workshop>=0.0.16,<2.0.0 From 2152386d5117fc3ce0873902bff55899f2e89ebd Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 15 Oct 2024 22:37:05 +0000 Subject: [PATCH 5/6] Increment Version to 0.1.3a1 --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 03493443..98468119 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 1 -VERSION_BUILD = 2 +VERSION_BUILD = 3 VERSION_ALPHA = 1 # END_VERSION_BLOCK From 0fe2e232fa19bd4f2e91f82f84b702674121eb84 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 15 Oct 2024 22:37:26 +0000 Subject: [PATCH 6/6] Update Changelog --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bda8ae50..98057561 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.1.3a1](https://github.com/OpenVoiceOS/skill-ovos-weather/tree/0.1.3a1) (2024-10-15) + +[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-weather/compare/0.1.2a1...0.1.3a1) + +**Fixed bugs:** + +- deprecated methods [\#75](https://github.com/OpenVoiceOS/skill-ovos-weather/issues/75) + +**Merged pull requests:** + +- fix:workshop\_100\_compat [\#78](https://github.com/OpenVoiceOS/skill-ovos-weather/pull/78) ([JarbasAl](https://github.com/JarbasAl)) + ## [0.1.2a1](https://github.com/OpenVoiceOS/skill-ovos-weather/tree/0.1.2a1) (2024-10-15) [Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-weather/compare/0.1.1...0.1.2a1)