From d45e01bb60d398af0d5fa3a6263376d8417f01a6 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 19 Nov 2024 22:42:16 +0000 Subject: [PATCH 1/3] requirements:skills list (#599) * requirements:skills list * requirements:skills list * requirements:skills list * requirements:skills list * Update skills-extra.txt * Update skills-extra.txt * requirements.txt --- .github/workflows/build_tests.yml | 2 +- requirements/skills-desktop.txt | 2 ++ requirements/skills-essential.txt | 2 -- requirements/skills-extra.txt | 8 ++++++++ requirements/skills-gui.txt | 4 +++- setup.py | 1 + 6 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 requirements/skills-extra.txt diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index f1972906b18d..4bc177369915 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -40,4 +40,4 @@ jobs: python setup.py bdist_wheel - name: Install package run: | - pip install .[mycroft,lgpl,plugins,skills-essential,skills-audio,skills-gui,skills-internet,skills-media,skills-desktop] + pip install .[mycroft,lgpl,plugins,skills-essential,skills-extra,skills-audio,skills-gui,skills-internet,skills-media,skills-desktop] diff --git a/requirements/skills-desktop.txt b/requirements/skills-desktop.txt index 7a110cbffc8c..822399564f61 100644 --- a/requirements/skills-desktop.txt +++ b/requirements/skills-desktop.txt @@ -1,2 +1,4 @@ # skills that require a linux desktop environment ovos-skill-application-launcher>=0.5.6,<1.0.0 +ovos-skill-wallpapers>=1.0.2,<3.0.0 +ovos-skill-screenshot>=0.0.2,<1.0.0 diff --git a/requirements/skills-essential.txt b/requirements/skills-essential.txt index e87af0dc893d..d37926aad3c2 100644 --- a/requirements/skills-essential.txt +++ b/requirements/skills-essential.txt @@ -4,6 +4,4 @@ ovos-skill-alerts>=0.1.10,<1.0.0 ovos-skill-personal>=0.1.7,<1.0.0 ovos-skill-date-time>=0.4.2,<1.0.0 ovos-skill-hello-world>=0.1.10,<1.0.0 -skill-wordnet>=0.0.10,<1.0.0 -#skill-randomness>=0.0.1,<1.0.0 ovos-skill-spelling>=0.2.5,<1.0.0 diff --git a/requirements/skills-extra.txt b/requirements/skills-extra.txt new file mode 100644 index 000000000000..ccffc6b1ff23 --- /dev/null +++ b/requirements/skills-extra.txt @@ -0,0 +1,8 @@ +# skills providing non essential functionality +skill-wordnet>=0.0.10,<1.0.0 +#ovos-skill-randomness>=0.1.1,<1.0.0 +ovos-skill-days-in-history>=0.3.6,<1.0.0 +ovos-skill-laugh>=0.1.1,<1.0.0 +ovos-skill-number-facts>=0.1.4,<1.0.0 +ovos-skill-iss-location>=0.2.2,<1.0.0 +ovos-skill-cmd>=0.2.5,<1.0.0 diff --git a/requirements/skills-gui.txt b/requirements/skills-gui.txt index 6c154fcfb0b8..b214c5823864 100644 --- a/requirements/skills-gui.txt +++ b/requirements/skills-gui.txt @@ -1 +1,3 @@ -ovos-skill-homescreen>=3.0.2,<4.0.0 \ No newline at end of file +ovos-skill-homescreen>=3.0.2,<4.0.0 +ovos-skill-screenshot>=0.0.2,<1.0.0 +ovos-skill-color-picker>=0.0.2,<1.0.0 \ No newline at end of file diff --git a/setup.py b/setup.py index 7d5d0ae0b896..e668be5d9be0 100644 --- a/setup.py +++ b/setup.py @@ -79,6 +79,7 @@ def required(requirements_file): 'deprecated': required('requirements/extra-deprecated.txt'), 'plugins': required('requirements/plugins.txt'), 'skills-essential': required('requirements/skills-essential.txt'), + 'skills-extra': required('requirements/skills-extra.txt'), 'skills-audio': required('requirements/skills-audio.txt'), 'skills-desktop': required('requirements/skills-desktop.txt'), 'skills-internet': required('requirements/skills-internet.txt'), From b41474e4d3218347b2890149c5da31a3034709b2 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 19 Nov 2024 22:42:31 +0000 Subject: [PATCH 2/3] Increment Version to 0.2.14a1 --- ovos_core/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ovos_core/version.py b/ovos_core/version.py index db6ffb8c8fa2..2732eb2f6916 100644 --- a/ovos_core/version.py +++ b/ovos_core/version.py @@ -1,8 +1,8 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 2 -VERSION_BUILD = 13 -VERSION_ALPHA = 0 +VERSION_BUILD = 14 +VERSION_ALPHA = 1 # END_VERSION_BLOCK # for compat with old imports From a899817f99ffa7c0a59be67ed51e1310a5fdf337 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 19 Nov 2024 22:43:14 +0000 Subject: [PATCH 3/3] Update Changelog --- CHANGELOG.md | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd2f3b346aee..12b83a20992a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,20 +1,12 @@ # Changelog -## [0.2.13a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.13a1) (2024-11-19) +## [0.2.14a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.14a1) (2024-11-19) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.12a1...0.2.13a1) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.13...0.2.14a1) **Merged pull requests:** -- deprecate!:backend client [\#604](https://github.com/OpenVoiceOS/ovos-core/pull/604) ([JarbasAl](https://github.com/JarbasAl)) - -## [0.2.12a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.12a1) (2024-11-18) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.11...0.2.12a1) - -**Merged pull requests:** - -- Update ovos-skill-homescreen requirement from \<3.0.0,\>=1.0.4 to \>=1.0.4,\<4.0.0 in /requirements [\#602](https://github.com/OpenVoiceOS/ovos-core/pull/602) ([dependabot[bot]](https://github.com/apps/dependabot)) +- requirements:skills list [\#599](https://github.com/OpenVoiceOS/ovos-core/pull/599) ([JarbasAl](https://github.com/JarbasAl))