From 24ccc8805447eabea38cbd37a6864c4c044d65be Mon Sep 17 00:00:00 2001 From: NeonJarbas <59943014+NeonJarbas@users.noreply.github.com> Date: Fri, 12 Jan 2024 21:11:54 +0000 Subject: [PATCH] modernize (#3) * modernize * Update __init__.py --------- Co-authored-by: JarbasAi --- .gitignore | 192 ++++++---------------------------- LICENSE | 4 +- __init__.py | 14 +-- requirements.txt | 4 +- {ui => res}/tunein.png | Bin scripts/prepare_skillstore.py | 2 +- setup.py | 2 +- 7 files changed, 41 insertions(+), 177 deletions(-) rename {ui => res}/tunein.png (100%) diff --git a/.gitignore b/.gitignore index bf36907..85bea1f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,164 +1,34 @@ -!settingsmeta.yml -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -share/python-wheels/ +dev.env +.dev_opts.json +.idea +*.code-workspace +*.pyc +*.swp +*~ +mimic +/skills +pocketsphinx-python *.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ +build +dist +tornado.web +tornado.ioloop +mycroft/__version__.py +scripts/logs/* +logs/* .coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ +/htmlcov +test/audio_accuracy/data +scripts/*.screen +doc/_build/ +.installed +.mypy_cache +.vscode +.theia +.venv/ + +# Created by unit tests +test/unittests/skills/test_skill/settings.json +test_conf.json .pytest_cache/ -cover/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -.pybuilder/ -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -# For a library or package, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# .python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# poetry -# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. -# This is especially recommended for binary packages to ensure reproducibility, and is more -# commonly ignored for libraries. -# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control -#poetry.lock - -# pdm -# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. -#pdm.lock -# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it -# in version control. -# https://pdm.fming.dev/#use-with-ide -.pdm.toml - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ - -# pytype static type analyzer -.pytype/ - -# Cython debug symbols -cython_debug/ - -# PyCharm -# JetBrains specific template is maintained in a separate JetBrains.gitignore that can -# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore -# and can be added to the global gitignore or merged into this file. For a more nuclear -# option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ - -# vscode -.vscode/ \ No newline at end of file +/.gtm/ diff --git a/LICENSE b/LICENSE index c5ebd49..1486acc 100644 --- a/LICENSE +++ b/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright 2024 Casimiro Ferreira Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -200,5 +200,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -======================================================================= diff --git a/__init__.py b/__init__.py index 8287a05..0114f16 100644 --- a/__init__.py +++ b/__init__.py @@ -6,12 +6,10 @@ class TuneInSkill(OVOSCommonPlaybackSkill): - def __init__(self): - super().__init__("TuneIn") - self.supported_media = [MediaType.GENERIC, - MediaType.MUSIC, - MediaType.RADIO] - self.skill_icon = join(dirname(__file__), "ui", "tunein.png") + def __init__(self, *args, **kwargs): + self.supported_media = [MediaType.RADIO] + self.skill_icon = join(dirname(__file__), "res", "tunein.png") + super().__init__(*args, **kwargs) @ocp_featured_media() def featured_media(self): @@ -59,7 +57,3 @@ def search_tunein(self, phrase, media_type): "author": "TuneIn", "length": 0 } - - -def create_skill(): - return TuneInSkill() diff --git a/requirements.txt b/requirements.txt index 8546de7..cc9551a 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,4 @@ -ovos_workshop~=0.0,>=0.0.5 +ovos-utils >= 0.1.0a7 +ovos-bus-client>=0.0.9a2 +ovos-workshop>=0.0.16a3 tunein~=0.0,>=0.0.4a1 \ No newline at end of file diff --git a/ui/tunein.png b/res/tunein.png similarity index 100% rename from ui/tunein.png rename to res/tunein.png diff --git a/scripts/prepare_skillstore.py b/scripts/prepare_skillstore.py index bfdf10e..bfc50fd 100644 --- a/scripts/prepare_skillstore.py +++ b/scripts/prepare_skillstore.py @@ -19,7 +19,7 @@ base_dir = dirname(dirname(__file__)) desktop_dir = join(base_dir, "res", "desktop") -android_ui = join(base_dir, "ui", "+android") +android_ui = join(base_dir, "res", "+android") makedirs(desktop_dir, exist_ok=True) readme = join(base_dir, "README.md") diff --git a/setup.py b/setup.py index e3f1cd1..9cf9541 100755 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ def get_requirements(requirements_filename: str): def find_resource_files(): - resource_base_dirs = ("locale", "ui", "vocab", "dialog", "regex", "skill") + resource_base_dirs = ("locale", "res", "vocab", "dialog", "regex", "skill") base_dir = path.dirname(__file__) package_data = ["*.json"] for res in resource_base_dirs: