From 19fdc19ec5f891d120c746bd8b22e210eef3d6d4 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Mon, 18 Nov 2024 11:43:56 +0000 Subject: [PATCH 1/3] fix: icon (#16) * fix: icon * fix: icon --- MANIFEST.in | 3 --- README.md | 2 +- __init__.py | 2 +- somafm.png => res/somafm.png | Bin setup.py | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) rename somafm.png => res/somafm.png (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 870b808..bbac28c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,8 +1,5 @@ -recursive-include dialog * -recursive-include vocab * recursive-include locale * recursive-include res * -recursive-include ui * include README.md include requirements.txt include CHANGELOG.md diff --git a/README.md b/README.md index c12f8ab..c3993c4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SomaFM +# SomaFM OCP skill for SomaFM diff --git a/__init__.py b/__init__.py index a09209f..751241f 100755 --- a/__init__.py +++ b/__init__.py @@ -14,7 +14,7 @@ class SomaFMSkill(OVOSCommonPlaybackSkill): def __init__(self, *args, **kwargs): super().__init__(supported_media=[MediaType.MUSIC, MediaType.RADIO, MediaType.GENERIC], - skill_icon=join(dirname(__file__), "somafm.png"), + skill_icon=join(dirname(__file__), "res", "somafm.png"), skill_voc_filename="somafm_skill", *args, **kwargs) diff --git a/somafm.png b/res/somafm.png similarity index 100% rename from somafm.png rename to res/somafm.png diff --git a/setup.py b/setup.py index fb184ed..dcc86e4 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def get_requirements(requirements_filename: str): def find_resource_files(): - resource_base_dirs = ("locale", "qt5", "vocab", "dialog", "regex", "skill") + resource_base_dirs = ("locale", "res") base_dir = path.dirname(__file__) package_data = ["*.json"] for res in resource_base_dirs: From d1c230c75d7f1e5034fd92ba5925c53374cf4cb0 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 18 Nov 2024 11:44:09 +0000 Subject: [PATCH 2/3] Increment Version to 0.1.3a1 --- version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.py b/version.py index 815acd1..9846811 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 1 -VERSION_BUILD = 2 -VERSION_ALPHA = 0 +VERSION_BUILD = 3 +VERSION_ALPHA = 1 # END_VERSION_BLOCK From 2c20c52b3b73ed13db5fcf10f207bfe647828a51 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 18 Nov 2024 11:44:28 +0000 Subject: [PATCH 3/3] Update Changelog --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5201430..42631dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # Changelog -## [0.1.2a1](https://github.com/OpenVoiceOS/skill-ovos-somafm/tree/0.1.2a1) (2024-11-17) +## [0.1.3a1](https://github.com/OpenVoiceOS/skill-ovos-somafm/tree/0.1.3a1) (2024-11-18) -[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-somafm/compare/0.1.1...0.1.2a1) +[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-somafm/compare/0.1.2...0.1.3a1) **Merged pull requests:** -- fix: skilljson [\#14](https://github.com/OpenVoiceOS/skill-ovos-somafm/pull/14) ([JarbasAl](https://github.com/JarbasAl)) +- fix: icon [\#16](https://github.com/OpenVoiceOS/skill-ovos-somafm/pull/16) ([JarbasAl](https://github.com/JarbasAl))