-
Notifications
You must be signed in to change notification settings - Fork 1.3k
{start,stop}-mycroft.sh: make POSIX sh compatible and fix shellcheck issues #2686
{start,stop}-mycroft.sh: make POSIX sh compatible and fix shellcheck issues #2686
Conversation
Voight Kampff Integration Test Succeeded (Results) |
Hmm, not sure why Travis fails.
This works fine for me locally. Does |
The python env in Travis exists already so the .venv/bin/activate is not actually used here. Earlier the command failed and carried on with the already active venv. (See here for example https://travis-ci.org/github/forslund/mycroft-core/jobs/635713266#L1410)...so either add The following oneliner should be best according to stack overflow Rather long but still a single line... |
Voight Kampff Integration Test Failed (Results). |
I do not care if it's one line or more to be honest, but then again I'm not sure how to split that up into multiple 😂 Thanks for the explanation, I'll add that check. |
Voight Kampff Integration Test Failed (Results). |
2 similar comments
Voight Kampff Integration Test Failed (Results). |
Voight Kampff Integration Test Failed (Results). |
Voight Kampff Integration Test Failed (Results). |
1 similar comment
Voight Kampff Integration Test Failed (Results). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey, this looks great, thanks!
Only one small issue with shift
that I think we need to resolve.
Thanks @fermulator and @forslund for reviewing and testing this already too!
Voight Kampff Integration Test Failed (Results). |
2 similar comments
Voight Kampff Integration Test Failed (Results). |
Voight Kampff Integration Test Failed (Results). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, looks like we aren't quite done...
Voight Kampff Integration Test Failed (Results). |
1 similar comment
Voight Kampff Integration Test Failed (Results). |
Just rebased this. @krisgesling anything holding this back other than #2802 to be merged? |
Voight Kampff Integration Test Failed (Results). |
Those extra options are not enabled in busybox (at least not the configured version in poky yocto distribution) This will also help to support systems without coreutils, Relate-to: MycroftAI#2686 Signed-off-by: Philippe Coval <philippe.coval@astrolabe.coop>
Those extra options are not enabled in busybox (at least not the configured version in poky yocto distribution) This will also help to support systems without coreutils, Relate-to: MycroftAI#2686 Signed-off-by: Philippe Coval <philippe.coval@astrolabe.coop>
Those extra options are not enabled in busybox (at least not the configured version in poky yocto distribution) This will also help to support systems without coreutils, Forwarded: MycroftAI#2966 Relate-to: MycroftAI#2686 Signed-off-by: Philippe Coval <philippe.coval@astrolabe.coop>
Hello @PureTryOut! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found: There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻 Comment last updated at 2021-11-04 10:07:59 UTC |
Bash dependency maybe droped once scripts are simplified to support busybox. Relate-to: MycroftAI/mycroft-core#2686 Change-Id: Ibbb6c2e72f56f35ce475c045e52b4d4e56275348 Signed-off-by: Philippe Coval <rzr@users.sf.net> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Bash dependency maybe droped once scripts are simplified to support busybox. Relate-to: MycroftAI/mycroft-core#2686 Change-Id: Ibbb6c2e72f56f35ce475c045e52b4d4e56275348 Signed-off-by: Philippe Coval <rzr@users.sf.net> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Codecov Report
@@ Coverage Diff @@
## dev #2686 +/- ##
=======================================
Coverage 53.04% 53.04%
=======================================
Files 123 123
Lines 11170 11170
=======================================
Hits 5925 5925
Misses 5245 5245 Continue to review full report at Codecov.
|
ShellCheck is a static analysis tool for shell scripts with the goal to: - point out and clarify typical beginner's syntax issues that cause a shell to give cryptic error messages - point out and clarify typical intermediate level semantic problems that cause a shell to behave strangely and counter-intuitively - point out subtle caveats, corner cases and pitfalls that may cause an advanced user's otherwise working script to fail under future circumstances I've ran this tool over both start-mycroft.sh and stop-mycroft.sh and fixed any issue that popped up
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks really good and seems to work well. I did find a place where the check-dependencies
call hadn't been updated (L202)
This makes the start and stop scripts compatible with POSIX shells. Overview of the changes: - "function" statements removed, not necessary and incompatible - dashes in function and variable names for lower ones (- to _) - source statements changed for . - double square brackets replaced for single ones - double equal statements replaced for single ones - &> (piping stdout and stderr to the same file) replaced for 2>&1 > - sourcing of mycroft-skill-testrunner replaced with direct execution with Bash - replaced BASH_SOURCE with $0, these scripts are never sourced anyway - replaced "echo -n" statements with "printf" - merged the "" and "all" cases to a single one
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With Ake's final catches addressed, this seems good to go!
🎉 🎉 🎉 🎉 🎉 🎉 🎉 🎉 🎉 🎉 🎉 🎉 🎉
Requested changes have been addressed.
commit 6af431375d30fab6fead2df747c67e325dcf2fa1 Author: Bart Ribbers <bribbers@disroot.org> Date: Thu Jun 2 02:11:03 2022 +0200 Don't install pulseaudio-dev on Alpine Linux systems (#3109) * Prefix the Alpine Linux virtual package name with a dot This way the package is easy to recognize when inspecting /etc/apk/world, and it's actually a standard to do so for virtual packages * Put all Alpine Linux deps on seperate lines This way you get cleaner git diffs, showing more clearly what is changing when adding or removing something * Don't install pulseaudio-dev on Alpine Linux systems It doesn't actually seem to be required by any of the PyPi deps commit 56ceb80179a79dfb294f0b3eecdc6612642964c1 Author: Bart Ribbers <bribbers@disroot.org> Date: Sun Sep 6 12:00:11 2020 +0200 {start,stop}-mycroft.sh: port to POSIX sh This makes the start and stop scripts compatible with POSIX shells. Overview of the changes: - "function" statements removed, not necessary and incompatible - dashes in function and variable names for lower ones (- to _) - source statements changed for . - double square brackets replaced for single ones - double equal statements replaced for single ones - &> (piping stdout and stderr to the same file) replaced for 2>&1 > - sourcing of mycroft-skill-testrunner replaced with direct execution with Bash - replaced BASH_SOURCE with $0, these scripts are never sourced anyway - replaced "echo -n" statements with "printf" - merged the "" and "all" cases to a single one commit dadbd23976079694b7b6870546ac1589943b31d7 Author: Bart Ribbers <bribbers@disroot.org> Date: Sun Sep 6 11:33:04 2020 +0200 {start,stop}-mycroft.sh: fix shellcheck issues ShellCheck is a static analysis tool for shell scripts with the goal to: - point out and clarify typical beginner's syntax issues that cause a shell to give cryptic error messages - point out and clarify typical intermediate level semantic problems that cause a shell to behave strangely and counter-intuitively - point out subtle caveats, corner cases and pitfalls that may cause an advanced user's otherwise working script to fail under future circumstances I've ran this tool over both start-mycroft.sh and stop-mycroft.sh and fixed any issue that popped up commit a909fc8f197aeb069999135dfe6ad1579ff69772 Author: Åke <ake.forslund@gmail.com> Date: Thu Apr 21 23:47:56 2022 +0200 Requirements: remove pychromecast (#3098) commit f030b7e165f767844f8c29b249a9a3200a227b1d Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Apr 20 10:23:48 2022 +0930 Silence file does not exist error when clearing VK files (#3093) When clearing VK test files - if some files didn't exist (because they weren't created) the bare rm command will report an error that the files didn't exist. We don't care, only that they are removed if they did exist. commit bf85e5c9c5b0e2eefd22e73449533b4faa65275d Author: Åke <ake.forslund@gmail.com> Date: Tue Apr 19 23:31:30 2022 +0200 Remove the chromecast audio backend (#3097) The pychromecast module is quite outdated and I think the backend would fit better as a plugin now. commit 3d64aa5940a8046894d563146bfc88015104ed94 Author: Åke <ake.forslund@gmail.com> Date: Fri Apr 8 02:58:56 2022 +0200 dev_setup: Give packages in separate args to pacman (#3094) This makes sure the packages aren't clumped together into a single argument when using pacman to install packages for arch linux. commit 28d512e54c80ef574394bbda6cf66911dc0d9a10 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Thu Apr 7 15:45:10 2022 +0930 Fix shellcheck error on Arch install command (#3092) Double quote to prevent globbing commit 2d15fca5816c754a3210a6850bf676fcc413b0fd Author: Khionu Sybiern <dev@khionu.net> Date: Wed Apr 6 22:15:06 2022 -0700 Add pipewire check for Arch installs (#3091) Check if pipewire-pulse is installed, installs pulse otherwise ==== Fixed Issues ==== Partial fix: #2980 ==== Tech Notes ==== pipewire-pulse is a compat layer, providing a pulseaudio API commit c6f7c1ad0a74cdeaa6883ae8be0847bf9824c1de Author: Åke <ake.forslund@gmail.com> Date: Thu Apr 7 06:51:26 2022 +0200 Shellcheck scripts in root folder (#3090) * Fix Shellcheck: Add -r flag to read read will mangle backslashes without it. These are not expected characters so not explicitly necessary, but also won't hurt. * Fix Shellcheck SC2086: Double quote variables * Fix Shellcheck SC2004: dollar sign unnecessary on arithmetic vars * Fix Shellcheck SC2129: use curly braces to >> file * Disable shellcheck on sourced venv/bin/activate * Fix Shellcheck SC1004 Simplify sed-expression to be a single line only removing the need for the offending / and linefeed * Fix Shellcheck SC2046 when finding repo root Splits the check into to files to be able to quote the expressions in a good way. * Fix Shellcheck SC2086 Unquoted apt packagaes This converts the variable APT_PACKAGE_LIST from a string to an array. This is a safer way to handle arguments according to BashFAQ (http://mywiki.wooledge.org/BashFAQ/050) * Fix Shellcheck SC2230 by changing which to command -v * CICD: Activate shellcheck job for dev_setup.sh * Shellcheck start-mycroft.sh This fixes the following shellcheck issues: - https://www.shellcheck.net/wiki/SC2164 -- Use 'cd ... || exit' or 'cd ... |... - https://www.shellcheck.net/wiki/SC2206 -- Quote to prevent word splitting/g... - https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ... - https://www.shellcheck.net/wiki/SC2124 -- Assigning an array to a string! A... The command is added to the CICD run of shellcheck * Shellcheck stop-mycroft.sh Fixes the following issues: - https://www.shellcheck.net/wiki/SC2164 -- Use 'cd ... || exit' or 'cd ... |... - https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ... The file is now automatically checked by the CICD job * Shellcheck venv-activate.sh Fix the following shellcheck issues: - https://www.shellcheck.net/wiki/SC2068 -- Double quote array expansions to ... - https://www.shellcheck.net/wiki/SC2145 -- Argument mixes string and array. ... - https://www.shellcheck.net/wiki/SC2128 -- Expanding an array without an ind... - https://www.shellcheck.net/wiki/SC2139 -- This expands when defined, not wh... - https://www.shellcheck.net/wiki/SC2155 -- Declare and assign separately to ... The help for invalid arg now works when the faulty argument isn't the first argument Co-authored-by: Kris Gesling <kris.gesling@mycroft.ai> commit ccd577bbf4583fce228826818cff76aa65268ae4 Author: fsa317 <33432460+fsa317@users.noreply.github.com> Date: Tue Mar 22 21:54:38 2022 -0400 Issue-3006 replaced hot_words with hotwords to correctly lookup configuration (#3088) commit 536ea7e9b5db5f6b8d879ede7c18e47a963b3278 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Mar 22 15:47:43 2022 +0930 Remove skills dir symlink on --clean (#3086) * Remove skills dir symlink on --clean * Add note on --clean about files not removed commit 5f4c68e5831e668f11dddc9a2d00bf11698f8c5b Author: Åke <ake.forslund@gmail.com> Date: Mon Mar 7 01:33:10 2022 +0100 Don't overwrite invalid json in config (#2881) * Separate tests of LocalConf into new test class * Do not overwrite configs with malformed json If a config file is loaded and is invalid saves to that file will not be possible until it's manually restored. The store accepts a force flag to override this protection. The method returns True if the store succeeded so call sites can verbally report the issue as well. commit 660b7b9bd32c4b2cd366a2599f2f20ed5142f9ab Merge: e7ddd51256 b583cbbf7e Author: Åke <ake.forslund@gmail.com> Date: Wed Mar 2 08:33:42 2022 +0100 Merge pull request #3082 from MycroftAI/refactor/python-detect Send python version detection output to /dev/null commit b583cbbf7e693d009998b0a6e0a0f3b4cff7b0aa Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Mar 2 12:14:53 2022 +0930 Send python version detection output to /dev/null commit e7ddd5125650ff9dfcee849a396fe5ebb3eeebb5 Author: Åke <ake.forslund@gmail.com> Date: Wed Mar 2 01:29:57 2022 +0100 TTS playback queue singleton (#3055) * fix issues when remote excepts out * Remove explicit clear_cache from MimicTTS * Updates for using singleton TTS playback thread - Cache is called on all tts's registered as using the thread - Begin audio and end audio is handled by the playback thread - Further changes from self.playback to TTS.playback for consistency * Remove redundant try/except * Consolidate general and TTS-specific sentence splitting This performs all sentence-splitting at the same stage. This fixes a subtle issue where a TTS splits a sentence into chunks and throws an error on only one of those chunks. The fallback would generate a sentence for the original un-chunked sentence. possibly saying the same parts twice. This also pre-compiles the regexes used to speed things up a bit. Co-authored-by: Ken <ken.smith@mycroft.ai> commit 36620af703dd0fcc3e75dd285ff42c4e20b9ea7c Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Mar 1 07:46:21 2022 +0930 Remove inflection dependency (#3031) The dependency was being used for a single string operation that is easily replaced. commit f0eecc93e1381c255b2718a60cdc0f73e10f1ed5 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Mar 1 07:44:54 2022 +0930 Bump requests to remove GPL from dependency tree (#3081) Versions prior to 2.26.0 used a GPL licensed package Chardet. This has been replaced with charset_normalizer (MIT license). commit 012d5a517c15c186c759f78ba13d5d0a35c5e954 Merge: eb97bb339e 909d89e28e Author: Åke <ake.forslund@gmail.com> Date: Mon Feb 28 21:54:32 2022 +0100 Merge pull request #3080 from MycroftAI/bugfix/pip-install Fix pip url for Python > 3.6 commit eb97bb339e506143ba40c162d09c66139c651315 Author: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Sun Feb 27 22:06:48 2022 -0800 Add `supported_languages` parameter to STT and TTS base classes (#3059) * Add `supported_languages` parameter to STT and TTS base classes * Refactor `supported_languages` to `available_languages` and updated docstring to be more precise commit dd7f7abba6fe9e8f88519c2f07eded7d5645fbde Author: Åke <ake.forslund@gmail.com> Date: Mon Feb 28 06:14:15 2022 +0100 Shellcheck scripts folder (#3063) * Remove unused scripts install-pocketsphinx and install-pygtk is no longer used by the dev-setup. * Fix shellcheck issues in scripts * Remove space in cores argument * Update my-info.sh script - Make it use the new method to activate venv if needed - Improve requirements.txt parsing - Update process detection from old "screen" setup - Update log-files paths - Fix finding mycroft-core folder * Fix shellcheck issues in mycroft-use.sh Mainly quoting but also unpacking of arguments and improving some if statements * Update shellcheck test to include scripts folder commit df0b8fe212b8508155edb4f32e57e1819575a709 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Feb 23 11:41:24 2022 +0930 Remove mplayer audioservice It is no longer supported by the projects maintainer. commit 909d89e28e3bcfb92437f0662ed04ce10e375ba5 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Mon Feb 28 14:28:54 2022 +0930 Fix pip url for Python > 3.6 commit 8ee3e8d64018d87aee87983c6a1f64acff581666 Author: Åke Forslund <ake.forslund@gmail.com> Date: Sun Dec 19 14:20:44 2021 +0100 Add noise_words.list for Swedish commit e1731f53ec3c8ff842989ede0ead2cdb753ccb7a Author: Åke Forslund <ake.forslund@gmail.com> Date: Fri Dec 17 16:56:02 2021 +0100 Remove unused imports from common_query_skill.py commit 3fa99f288fbe2916ec36670e04a239964d3841c5 Author: Åke Forslund <ake.forslund@gmail.com> Date: Fri Dec 17 16:53:42 2021 +0100 Handle missing noise words file in CQS This treats a None result from resolve_resource_file() as a FileNotFound exception. commit 47911146095e8ebae29bd4694029b283a3c8133c Author: luca-vercelli <luca.vercelli.to@gmail.com> Date: Thu Feb 24 01:51:17 2022 +0100 missing initial value (#3061) Condition if [ $disable_precise_later == true ]; gives a syntax error if variable is not initialized commit 953cc53e13cb35a6e1012b980ad3ceadb09dbeb0 Merge: 99ac12cbf8 6d66b800dc Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Thu Feb 24 10:17:11 2022 +0930 Merge pull request #3060 from kleo/dev Use double bracket for shell conditional commit 99ac12cbf84ef8609a52851e21c1bfada8f74c0c Merge: 34f66d234c f8aa77c8e7 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Feb 23 16:44:33 2022 +0930 Merge pull request #3068 from forslund/bugfix/vk-dialogfile-from-sentence Voight kampff: Bugfix dialogfile from sentence commit 34f66d234c73715422d8fa392f366700a8760ff9 Author: TheRealDGD <99516116+TheRealDGD@users.noreply.github.com> Date: Wed Feb 23 07:38:46 2022 +0100 Added duration_to_bytes to FileMockMicrophone (#3071) * Added duration_to_bytes to FileMockMicrophone Added duration_to_bytes to fix AttributeError: 'FileMockMicrophone' object has no attribute 'duration_to_bytes' in call from mycroft-core/mycroft/client/speech/mic.py _wait_until_wake_word * Update wake_word_test.py Fixed formatting issues * Update wake_word_test.py Fixed formatting * Remove whitespaces for PEP8 Co-authored-by: Kris Gesling <kris.gesling@mycroft.ai> commit f556f844120ac30701536b37f3e747624db123ab Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Feb 23 15:42:16 2022 +0930 Add phonetic spellings for IP and Wikipedia (#3023) Co-authored-by: jarbasal <jarbasai@mailfence.com> commit 1ae6900b26e8efb4c014b04cd26572adf10b07b2 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Feb 23 15:40:53 2022 +0930 Remove ResponsiveVoice TTS module from core (#3049) This module in its current format does not work due to API changes. There is also a community built plugin that is now described in our documentation. commit 5d88eb3a33c17271d04364b610cd204517b05181 Author: Aditya Mehra <aix.m@outlook.com> Date: Wed Feb 23 16:31:19 2022 +1030 Fix: show text delegate as per autofit label refactor (#3065) * fix show text delegate as per autofit label refactor * Make rectangle containing text transparent For different background colors, the background on the card should be set. Co-authored-by: Kris Gesling <kris.gesling@mycroft.ai> commit 0dadc9ba0750aaf6680dd1b91fa1c01fa398b2ec Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Feb 23 14:47:03 2022 +0930 Switch CLA Checker to new credentials (#3077) commit a487f66958b759342d055e3f61add6dd594be485 Author: Åke <ake.forslund@gmail.com> Date: Mon Feb 14 06:40:24 2022 +0100 Select the proper get-pip url for Python 3.6 (#3073) The bootstrap script no longer supports Python 3.6, instead it recommends python 3.6 users to use an alternative url. commit f8aa77c8e7ccdb39bafab9bdf12e86b07dbb2310 Author: Åke Forslund <ake.forslund@gmail.com> Date: Wed Jan 26 21:01:46 2022 +0100 VK simplify dialog matching This uses the existing dialog renderer and the standard format library to in two steps create a regex where the {elements} in a dialog is replaced with ".*" to match the given sentence. commit a3fd830cb0ae3deef01d0e4d3cfc4512fd55f269 Author: Åke Forslund <ake.forslund@gmail.com> Date: Wed Jan 26 12:55:36 2022 +0100 VK: Expand the parentheses from dialog files commit 825b3879a51c15513e069e61872266bfa55ecd99 Author: Åke Forslund <ake.forslund@gmail.com> Date: Tue Jan 18 13:13:50 2022 +0100 VK: Fix regex used in _match_dialog_patterns A redundant step caused issue when performing tests in the tv-remove-control-skill commit 03ef7f4b219533507f016c64a45487bc827ec78c Author: Åke Forslund <ake.forslund@gmail.com> Date: Tue Jan 18 13:12:30 2022 +0100 VK: Include locale folders in dialog_from_sentence Only dialog folder was used previously this adds globbing through the locale/lang/ folder and it's subfolders commit 6d66b800dc9d86235ab0139d146eb89494c482ca Author: Kleo Bercero <kbeflo@gmail.com> Date: Sat Jan 1 19:49:36 2022 +0800 Use double bracket commit 3d963cee402e232174850f36918313e87313fb13 Merge: 2411f5d317 4dd3dd3027 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Mon Dec 13 10:07:11 2021 +0930 Merge pull request #3047 from forslund/feature/do-not-create-identity-folder Do not create identity folder when trying to read the identity file commit 2411f5d317c0299e4f42bd459fdc7dd19299f571 Merge: 947b7f3fc7 bdfb7c3981 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Mon Dec 13 10:06:30 2021 +0930 Merge pull request #3043 from MycroftAI/feature/pyxdg-update Update pyxdg to ensure Python3.8 compatibility commit 947b7f3fc72f475b90f9f1b516bea61c66fb7542 Merge: 4061a04bb4 b0f9a10e71 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Mon Dec 13 10:06:15 2021 +0930 Merge pull request #3030 from forslund/cicd/shellcheck-directives Use shellcheck directive instead of excludes commit 4061a04bb473726183419620a0e6517be944486d Merge: 322a4c5599 9468c20558 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Mon Dec 13 10:05:51 2021 +0930 Merge pull request #3014 from putnik/dev Update Russian words and dialogues commit 322a4c55993605bff1fbf88a3cfbb109dc144c74 Author: devs-mycroft <devs@mycroft.ai> Date: Fri Dec 10 04:51:54 2021 +0000 Version bump from 21.2.1 to 21.2.2 commit 4dd3dd30274386644856a9c1b1a567431777a0ce Author: Åke Forslund <ake.forslund@gmail.com> Date: Sun Dec 5 16:47:00 2021 +0100 Add log if an exception loading identity occurs commit b342ab70c35641db69f01b51eb19cfc6e95cabf3 Author: Åke Forslund <ake.forslund@gmail.com> Date: Sat Dec 4 17:18:33 2021 +0100 Only try to open the identity2.json if it exists commit ae9997439866cd89d6a698e589d13dcefc9102b1 Merge: d479a79b7e 6b5d45e507 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Dec 1 09:17:41 2021 +0930 Merge pull request #3045 from forslund/bugfix/config-creation-at-import Do not create configs folders until writing commit d479a79b7e132ee7022039bae2613832890b133b Merge: 8e319b49ef 70df575d43 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Dec 1 09:13:28 2021 +0930 Merge pull request #3033 from forslund/bugfix/config Fix config priority commit 6b5d45e50780aef98e706313f652fcf58cf3579b Author: Åke Forslund <ake.forslund@gmail.com> Date: Tue Nov 30 21:34:46 2021 +0100 Do not create configs folders until writing This replaces save_*_path with usage of the xdg_*_home when handling config files. This means the config folders will not be created unless actually written to. The check for whether a directory needs to be created is handled behind a lock to avoid race conditions commit bdfb7c3981917275fd0f90a79fb3521f19faf46f Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Nov 30 22:20:12 2021 +0930 Update pyxdg for Python3.8 compatibility commit 8e319b49ef98b2f7f5d8c365e8a1d64be0fc58dd Merge: c3bd1f2c5f d9c280afd4 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Nov 30 07:09:26 2021 +0930 Merge pull request #3042 from HFabi/feature/issue-3041 Issue-3041 - Install pip for python version specified by argument in dev_setup commit d9c280afd4ece00f91628ba5d543ca5162cb23e3 Author: Fabian Heck <f.heck@nanogiants.de> Date: Mon Nov 29 16:57:34 2021 +0100 Issue-3041 - Install pip for python version specified by argument in dev_setup commit c3bd1f2c5f4d2c3b0a7c0196898c0119c33b2240 Merge: 89cfad7943 bd85c94cdb Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Mon Nov 29 12:12:58 2021 +0930 Merge pull request #3039 from rooky-c3bo/bugfix/issue-3026 Issue-3026 - Update Gentoo libffi dependency reference commit bd85c94cdbb4af8b2cdd346d6abae6dcc54ea8e2 Author: Bahadır Yaren <rooky@c3bo.org> Date: Thu Nov 25 12:21:00 2021 +0100 Issue-3026 - Fixing Gentoo dependency commit 89cfad794315198f5b1d99e4c11537425ae74ae5 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Nov 24 14:51:10 2021 +0930 Check if GUI is connected rather than maintain list of platforms (#3025) * Check if GUI is connected rather than maintain list of platforms There are already many Mycroft platforms that have GUIs and this will only grow. We want to know if the device has a GUI connected rather than if it is in a pre-defined list of platforms. * Create a mock GUI with a settable connected attribute commit b0f9a10e719c6fb50a253dcbba9cbd4813b1a7ea Author: Åke Forslund <ake.forslund@gmail.com> Date: Tue Nov 23 11:56:54 2021 +0100 Disable source lookup errors commit 77549d01e2d99440d39a762f6d5fd97587c1864c Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Mon Nov 22 15:00:20 2021 +0930 Remove incorrectly added args in GUIWebsocketHandler methods (#3036) PR #2879 updated the websocket-client and changed function signatures to account for API changes in that package. These were falsely changed as the GUI bus does not use the websocket-client. Consistency would be good however modifying the protocols would require significant work. For now we have two slightly different bus interfaces. commit e1dcebff8cb19729f2c1cdbaa168244eefabce54 Merge: ef56d71462 958d4fa05e Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Thu Nov 11 14:04:12 2021 +0930 Merge pull request #3028 from MycroftAI/bugfix/link-update Update link for Hub to point to official Github version commit 70df575d4377f2fa2ecdbaec85b931d893821e2b Author: Åke Forslund <ake.forslund@gmail.com> Date: Tue Nov 9 21:04:58 2021 +0100 Make log settings not cache local only config After startup the cached config would be without remote config. This makes sure the config without remote isn't cached. commit 5ff2cb099f2e5fb9f3b80ec0cd6efd80a6885ebc Author: Åke Forslund <ake.forslund@gmail.com> Date: Tue Nov 9 20:51:38 2021 +0100 Fix order of configs The old SYSTEM config was prioritized lower than the remote config commit ef56d714621728682f7376277df273b583e75722 Author: Genei180 <valentin.springer99@gmail.com> Date: Tue Nov 9 06:37:33 2021 +0100 Added Possibility for ESpeak Config (#3020) Added Possibility for ESpeak Config commit e6fe1bbc8affd2f7b22455dc21539ee6725fb45b Author: Åke Forslund <ake.forslund@gmail.com> Date: Mon Nov 8 07:46:52 2021 +0100 Use shellcheck directive instead of excludes This uses shellcheck directives instead of excludes only available in CICD. This leaves SC1090 as a general exclude commit 958d4fa05e0e7d76baefde98daf454168f67c039 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Sat Nov 6 06:13:58 2021 +0930 Update link for Hub to point to official Github version commit ea157598d70581dcaca719e19a2de76e880f76ed Merge: fd12c88da5 f8f640e3e5 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Fri Nov 5 06:12:08 2021 +0930 Merge pull request #3022 from MycroftAI/bugfix/gui-namespace-race-cond Fix race condition in GUI namespace insertion commit fd12c88da532fe5f1f37c8f73690ff4501ac6886 Author: Åke <ake.forslund@gmail.com> Date: Thu Nov 4 08:31:17 2021 +0100 Refactor/shellcheck bin (#3019) * Shellcheck and update mycroft-config * Shellcheck and update mycroft-pip * Shellcheck and update mycroft-cli-client * Shellcheck and update mycroft-help * Shellcheck and update mycroft-listen * Shellcheck and update mycroft-mic-test * Shellcheck and update mycroft-msk * Shellcheck and update mycroft-msm * Shellcheck and update mycroft-say-to * Shellcheck and update mycroft-skill-testrunner * Shellcheck and update mycroft-speak * Shellcheck and update mycroft-start * Shellcheck and update mycroft-stop * Add shellcheck step to github actions This runs most of the shellcheck tests. The excludes are: - SC1091: Avoids errors when shellcheck can't find sourced file - SC2034: Unused variables, for example colors that aren't used yet - SC2012: use of ls, from what I can see in our case this is fine (wc -l) The version is locked to latest master as of November 2 2021 commit 0ad093a8e33e245a87621047eac9c8e5c6d1a283 Merge: dd710a6a53 dca1184bd5 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Thu Nov 4 17:00:24 2021 +0930 Merge pull request #3021 from Saymantech-org/dev Azerbaijani language support commit f8f640e3e5260da33794fee55417cbeeb6cb198a Author: jarbasal <jarbasai@mailfence.com> Date: Fri Oct 22 00:04:00 2021 +0100 fix/race condition dictionary changed iteration bus events could cause the dict to change while being iterated commit dca1184bd5a54f950df947d132174bac9ad7bded Author: Siavash Mollayi <siavash.mollayi@gamil.com> Date: Wed Nov 3 15:57:34 2021 +0330 Azerbaijani language support commit 9468c205582663e040825ebbca5f2baa1a1b973c Author: Sergey Leschina <mail@putnik.tech> Date: Tue Nov 2 03:59:38 2021 +0300 Add more Russian phonetic spellings commit 81de3d4c446f1eb3559c0d59152807e61e7ebdf9 Author: Sergey Leschina <mail@putnik.tech> Date: Fri Oct 22 02:57:21 2021 +0300 Update Russian words and dialogs commit dd710a6a53383f257384758c6d1fa2833ffb98a6 Merge: 0247b3a4b5 2b05f27fea Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Mon Nov 1 11:17:18 2021 +0930 Merge pull request #2995 from MycroftAI/dependabot/pip/pillow-8.3.2 Bump pillow from 8.2.0 to 8.3.2 commit 0247b3a4b5c3389347bfa05aaa293ac24ee54842 Author: Gaëtan Trellu <gaetan.trellu@gmail.com> Date: Fri Oct 29 01:29:22 2021 -0400 [log_format] Add an option to change the log format (#3016) * [log_format] Add an option to change the log format Hacing an option to change the log format could be useful when logs are shipped into an aggregator such as Elasticsearch. The current format is very hard to parse. * [log_format] Set default Formatter Because mycroft.configuration.Configuration() class import LOG class, a default Formatter have to be defined before import the mycroft.configuration.Configuration() class. commit 34ee3a9a847dea9007357114fb9dc4b23142d903 Author: Bart Ribbers <bribbers@disroot.org> Date: Thu Oct 28 07:12:23 2021 +0200 Upgrade websocket-client to 1.2.1 (#2879) * Upgrade websocket-client to 1.2.1 core equivalent of https://github.com/MycroftAI/mycroft-messagebus-client/pull/21 There was an incompability with the latest websocket-client and the messagebus which needed fixing for Linux distro compatibility. Since messagebus-client was going to depend on websocket-client 1.2.1, let's do the same in core * Bump message bus client and tornado versions New version of the messagebus-client released. Upgraded Tornado to match new function signature. * Revert removal of websocket-client It is still used in the `mycroft.client.text.gui_server` Should investigate removal of this so that websocket client versions do not need to be kept in sync between mycroft-core and mycroft-messagebus-client. Co-authored-by: Kris Gesling <kris.gesling@mycroft.ai> commit a8ef467f4ef7c2741662554f8f60e436b1f40d8c Merge: 3495acf9ab aa067419b0 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Thu Oct 28 11:11:01 2021 +0930 Merge pull request #3015 from goldyfruit/dev [mycroft-config] Fix issue #2991 - use new XDG compliant mycroft.conf location commit aa067419b0119e8c312d9416625f5f17136f76e6 Author: Gaëtan Trellu <gaetan.trellu@gmail.com> Date: Mon Oct 25 14:20:25 2021 -0400 [mycroft-config] Fix missing $... commit 782c174668cf57e1c6b08eda517c40b488251d9c Author: Gaëtan Trellu <gaetan.trellu@gmail.com> Date: Sat Oct 23 21:43:06 2021 -0400 [mycroft-config] Fix issue #2991 commit 3495acf9abb183a7b36e5ebc0a8f5c25159993f8 Merge: e6ad7faf80 0f98c566b9 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Thu Oct 21 12:25:34 2021 +0930 Merge pull request #3003 from Joanguitar/dev Add reusable PadatiousMatcher to speed up intent matching commit e6ad7faf8054311f136c18e5f2c0825126d26fe6 Merge: 6daccc4171 f50b27f839 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Oct 20 16:02:46 2021 +0930 Merge pull request #3012 from in03/bugfix/issue-3011 Fix disabling of Precise on systems without AVX or similar commit f50b27f8392737649f4b107e3a233f37e9f670ec Author: Caleb Trevatt <pebblefarmer@outlook.com> Date: Mon Oct 18 23:37:16 2021 +1000 Issue-3011 - Fixed AVX / Precise unavailable check commit faebb13e1029a86ec6ecaccba8276c696cdf22f7 Author: Caleb Trevatt <pebblefarmer@outlook.com> Date: Mon Oct 18 23:32:43 2021 +1000 Issue-3011 - Fixing AVX / Precise unavailable check commit 6daccc41711a8c0b51c152ef23fe2d6fefbece9e Merge: df78af15cb 5229f61bbf Author: Åke <ake.forslund@gmail.com> Date: Sat Oct 16 13:06:47 2021 +0200 Merge pull request #3010 from MycroftAI/bugfix/skill-loader-log-msg Fix formatting error in skill loader log message commit 5229f61bbf37f91efe7e63c3bd95b43b85fe18d1 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Fri Oct 15 14:51:05 2021 -0500 Fixed formatting error in skill loader log message commit df78af15cb8e736e849b96bcd9a0c36e6e4315c9 Merge: 039c84ee81 4b729dc978 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Thu Oct 7 10:59:50 2021 -0500 Merge pull request #3002 from MycroftAI/test/extend-criteria-matcher Extended the idea of the VK CriteriaWaiter commit 4b729dc978d9dd13efaf9356231bbcb49d4e015f Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Wed Sep 29 17:57:31 2021 -0500 Make matcher class signatures more consistent. commit acd6d4065adfdac3e9dd91503d912f2f7681171b Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Tue Sep 28 12:41:36 2021 -0500 Apply code review changes. commit 039c84ee818529a7a37c1b0f3f3cb27e00c54b78 Merge: 2a6bb90c9f 32812f605b Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Sep 28 17:09:59 2021 +0930 Merge pull request #3000 from el-tocino/bugfix/2999 alter avx test to accomodate aarch64 commit 2a6bb90c9f673b9ff569945e885bb42cd7814354 Merge: 5e81e2747b f709bb9a1e Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Mon Sep 27 10:30:12 2021 +0930 Merge pull request #2963 from forslund/feature/update-adapt-keyword-registration-message Update key names in adapt keyword registration message commit f709bb9a1e4c7315be9ffa433aeabfb24c185891 Author: Åke Forslund <ake.forslund@gmail.com> Date: Mon Aug 2 10:52:10 2021 +0200 Use IntentServiceInterface in MycroftSkill.register_vocabulary() This moves the message logic for adapt keyword registration into a single location. commit 189267b6f66c0569f25a5538051b05369e101d05 Author: Åke Forslund <ake.forslund@gmail.com> Date: Thu Jul 29 13:17:56 2021 +0200 Minor cleanup of test case for keyword registration commit 693100e8c61566ffb140b53ebb76a1303bada238 Author: Åke Forslund <ake.forslund@gmail.com> Date: Thu Jul 29 13:10:54 2021 +0200 Match keyword entity terms in Mycroft with Adapt This changes the internally used names for entities and entity values when sent on the messagebus and used interanally in the intent service from start / end to entity_value and entity_type. This makes the terminology easier to understand and follow across into Adapt. The old terms are still included and usable for compatibility but should be removed in an upcoming major release (22.02). commit 5e81e2747b94376c374b196fb3e11a436b72d694 Author: ken-mycroft <67077327+ken-mycroft@users.noreply.github.com> Date: Mon Sep 20 03:03:28 2021 -0400 Improve confidence calculation for Common Query (#2986) * Improve confidence calculation * Add actual noise words file * Update expected test confidence levels Co-authored-by: Kris Gesling <kris.gesling@mycroft.ai> commit 0f98c566b94369aa8b34a9e936d250aa211790e0 Author: Joan Palacios <jopabel93@gmail.com> Date: Thu Sep 16 13:31:22 2021 -0400 Removed lru_cache commit 863e7844d1486c3ebc987f18ee67e6dbad2d9e70 Author: Joan <joanguitar@hotmail.com> Date: Thu Sep 16 12:48:23 2021 -0400 Padatious doesn't need to run 3 times commit 3c76177e75c1859a4a23b639438379455033d063 Merge: 9e9f2f74e5 0896c3ceda Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Wed Sep 15 08:27:12 2021 -0500 Merge pull request #3001 from MycroftAI/bugfix/vk-bus-remove-exception fixed an error with message formatting in a ValueError message commit 7f7460a6cd195a4931c0c11fb42d9671db0aac06 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Tue Sep 14 14:49:39 2021 -0500 Fix a PEP8 speaks issue commit 1856296ea7282ece7457a559757f96a8c40b0013 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Tue Sep 14 14:40:27 2021 -0500 Extended the idea of the criteria matcher to handle other types of matching commit 0896c3cedae91661828584b6bc7e0454bf4556e1 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Tue Sep 14 14:31:35 2021 -0500 fixed an error with message formatting in a ValueError message. commit 32812f605b2a4b2048e7a0fefbdf64a97348c7dc Author: el-tocino <email+github@aforkinthetoad.com> Date: Tue Sep 14 01:27:06 2021 -0500 alter avx test to accomodate aarch64 commit 9e9f2f74e551efebacf1bd26fc3ed7fde35fae48 Merge: 600aa76206 8d11349b65 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Mon Sep 13 16:37:49 2021 +0930 Merge pull request #2975 from MycroftAI/feature/vk-only-shutdown-on-ci VK: Only stop Mycroft services if running in CI commit 600aa76206a7e7ffa2fbba9dfc62f51080420a44 Author: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Sun Sep 12 18:45:57 2021 -0700 Add 'utterances' to message emitted to skill intent handler (#2997) * Add 'utterances' to message emitted to skill intent handler * Reformat comment to resolve PEP warnings * Update comments per PR feedback * Cut line-length for style compliance Co-authored-by: Kris Gesling <kris.gesling@mycroft.ai> commit 06253906fc191c59bded69232f699ff427f58175 Merge: 5a1e4ed8b9 d26201d978 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Fri Sep 10 16:30:02 2021 -0500 Merge pull request #2979 from MycroftAI/bugfix/release-gui-on-shutdown Release GUI on Skill shutdown or reload commit 5a1e4ed8b9b77f5d83a89eed875c78301aaf2cf1 Merge: aa4a25f29f df94e2192a Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Fri Sep 10 16:29:14 2021 -0500 Merge pull request #2990 from MycroftAI/bugfix/vk-bus-clear-messages Fix messages clearing in the InterceptAllBusClient commit aa4a25f29f1f615a209b598c787ab8aa0a20d4cf Merge: 31b2979bf7 59c473cac8 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Fri Sep 10 11:30:43 2021 +0930 Merge pull request #2992 from MycroftAI/bugfix/ci-pulse-failing Fix pulseaudio daemon failing to start in CI commit 31b2979bf72e91a18b5144a49340b116d1c9331b Merge: 4bce5345cb 96e719fe2d Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Thu Sep 9 14:21:38 2021 +0930 Merge pull request #2996 from MycroftAI/bugfix/behave-install Patch dependencies that use the deprecated use_2to3 commit 96e719fe2d8e46a0f8686f8e31fd3f9ec500b3b2 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Sep 8 11:57:46 2021 +0930 remove use_2to3 from dependencies Setuptools deprecated use of `use_2to3` from v58 See changelog: https://setuptools.readthedocs.io/en/latest/history.html#v58-0-0 This has been reported upstream to both packages. The simplest fix seems to be removing Python2 support. It's more difficult to pin setuptools as this is installed via system packages in dev_setup.sh commit 2b05f27feaf6ede7cbd613266bc0c9eed3ed5e7f Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Sep 7 23:45:13 2021 +0000 Bump pillow from 8.2.0 to 8.3.2 Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.2.0 to 8.3.2. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/8.2.0...8.3.2) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> commit 4bce5345cbad1bbe39db4f7546f64edcf299361d Merge: 13539d3397 8a68c88bcf Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Sep 7 16:09:05 2021 +0930 Merge pull request #2985 from MycroftAI/feature/gTTS-warning Add warning for anyone loading GoogleTTS commit 59c473cac88a62c9420eab9b5a5aba9bf4b7435b Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Fri Sep 3 14:54:09 2021 +0930 Fix pulseaudio daemon failing to start in CI commit df94e2192a40e0b092900e2b84389935ac5d3d32 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Wed Sep 1 13:21:50 2021 -0500 fixed a few spelling errors. commit b6066f90c665b192f7532c22718d9ab07c3ecf85 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Wed Sep 1 13:15:53 2021 -0500 fixed an issue with how messages are cleared in the InterceptAllBusClient commit 13539d3397d4577b6f1e1cfbf02c5146f5123bd6 Author: devs-mycroft <devs@mycroft.ai> Date: Fri Aug 27 03:02:54 2021 +0000 Version bump from 21.2.0 to 21.2.1 commit 8a68c88bcf6aeca3bd18270f1d2ca3c8a714a8ec Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Fri Aug 27 09:49:40 2021 +0930 Add warning for anyone loading GoogleTTS commit c039aebc273fb87f32d287d11b6b5622ad3d7ed4 Merge: 61cbaa71cd 0f8222eef4 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Aug 18 15:22:53 2021 +0930 Merge pull request #2966 from CrossStream/sandbox/rzr/review/master scripts: Support busybox chown commit d26201d978d9288488cedd822894d8544e1147b4 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Aug 17 16:40:05 2021 +0930 Release GUI on Skill shutdown or reload commit 61cbaa71cddba2547682a3eb84bb715abf24e517 Merge: 8fcfa901c3 ac17d7899a Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Aug 17 09:53:25 2021 +0930 Merge pull request #2971 from strugee/patch-1 Install pulseaudio-utils on Fedora commit 8fcfa901c3ff9c0151e42773f54c185be6f18af1 Merge: 196e9750e3 eadb5c9985 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Fri Aug 13 14:53:46 2021 -0500 Merge pull request #2970 from MycroftAI/feature/mycroft-skills-adaptintent Provide AdaptIntent from mycroft.skills commit 8d11349b6515f45afaea9c4bcd547011e18a57d3 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Thu Aug 12 10:24:38 2021 +0930 Only stop Mycroft services if running in CI commit ac17d7899a357cc21876520b95ccc6e29935c6c1 Author: AJ Jordan <alex@strugee.net> Date: Mon Aug 9 06:29:20 2021 -0400 Install pulseaudio-utils on Fedora Needed for `paplay`. commit 196e9750e341ec7a0a8931fcf625b35d0a8eae6b Merge: 5f72294b61 8be5e9ba72 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Aug 11 09:44:05 2021 +0930 Merge pull request #2967 from AIIX/fix/webview_fullscreen add fullscreen fix for webviews commit 5f72294b6193a1759df916d2827f4ab0e27e652f Merge: 1256723c90 a65a3f7770 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Aug 10 15:39:44 2021 +0930 Merge pull request #2968 from forslund/test/vk-no-skill-updates-at-runtime Voight Kampff: No skill updates at runtime commit 1256723c90831fa1d66b98fc8802ee2bc5cdffba Merge: 170ebc44ec 4258e2f2ed Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Aug 10 13:47:33 2021 +0930 Merge pull request #2794 from forslund/pure-try-out/xgd-config Pure-try-out's XDG config PR with changed Jenkinsfile commit 0f8222eef4b19374d9dfd717d1ea8eacbd859820 Author: Philippe Coval <philippe.coval@astrolabe.coop> Date: Thu Aug 5 18:12:11 2021 +0200 scripts: Support busybox chown Those extra options are not enabled in busybox (at least not the configured version in poky yocto distribution) This will also help to support systems without coreutils, Forwarded: https://github.com/MycroftAI/mycroft-core/pull/2966 Relate-to: https://github.com/MycroftAI/mycroft-core/pull/2686 Signed-off-by: Philippe Coval <philippe.coval@astrolabe.coop> commit eadb5c9985b174290fae8a258f9bf9670317b663 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Mon Aug 9 15:55:04 2021 +0930 Provide AdaptIntent from mycroft.skills This is convenience for Skill developers who can now import all standard items from a single level. Eg: from mycroft.skills import MycroftSkill, intent_handler, AdaptIntent commit a65a3f7770e8ec092cedf582d963c0cb58c7e350 Author: Åke Forslund <ake.forslund@gmail.com> Date: Thu Aug 5 17:03:34 2021 +0200 Disable auto updates of skills during VK test run commit 8be5e9ba722771334b38c95d0b88be013af88678 Author: Aditya Mehra <aix.m@outlook.com> Date: Fri Aug 6 14:32:52 2021 +0930 add fullscreen fix commit 4258e2f2ed7fbe8691a62ae4ad916a75999c3c63 Author: Åke Forslund <ake.forslund@gmail.com> Date: Sun Jul 18 21:13:28 2021 +0200 Reorder imports of mycroft.configuration commit 87d22d30a49891056b5659a488c37da121865f2c Author: jarbasal <jarbasai@mailfence.com> Date: Wed Jul 7 15:38:40 2021 +0100 fix cyclic imports with LOG The mycroft.util.log module called LOG.init() which needs to read the config, the configuration module imports the log system to log causing cyclic import issues. This moves the LOG.init() call out of the log module making it possible to use the normal config system to init the logs and does a slight re-arrangement so that the uninited log can be used. commit 3fd96cf71b25aed79310cb4e9a0edf4fb185609d Author: Åke Forslund <ake.forslund@gmail.com> Date: Sat Jul 10 17:40:34 2021 +0200 WIP Review comments - Add TODO for 22.02 to remove the compatibility code - Make Warning a single Log statement - mycroft-config script now uses XDG-environment variable - Remove redundant code - Replace hard coded references to ~/.config - Explicitly remove new path before move of "filesystem" (if needed) commit 9029dc1f41d89d86c629ba45c750330b39755b61 Author: Åke Forslund <ake.forslund@gmail.com> Date: Mon Jul 5 07:22:52 2021 +0200 Slight cleanup - Make XDG usage more visible by using the xdg module prefix - fix overloaded python keywords - remove unused imports commit 8e69d4616d7052e512ff5f90fe72fe62c62f3361 Author: Åke Forslund <ake.forslund@gmail.com> Date: Wed May 5 20:32:19 2021 +0200 Correct resolution order for resolving log configs commit 28017993c5fae3fedb0d8b8bd08d7db3de76faff Author: Åke Forslund <ake.forslund@gmail.com> Date: Sun Feb 21 18:08:46 2021 +0100 Restore system locations to mycroft.configuration Fixes issue with Timer skill commit faf101bfcd0ab5784a88e9a62bb633ff8b72b3ae Author: Åke Forslund <ake.forslund@gmail.com> Date: Sun Jan 31 08:56:10 2021 +0100 Increase Jenkins timeout commit e20443b82458a1185743fe82ced5bf1788b8d3f0 Author: Bart Ribbers <bribbers@disroot.org> Date: Fri May 8 21:32:33 2020 +0200 Use XDG Base directories for settings, cache and runtime data Improve deprecation warning message commit ff9f8e898dc11fe38a8731f9240e037b5cae1129 Author: Åke Forslund <ake.forslund@gmail.com> Date: Fri Jan 8 21:40:22 2021 +0100 Update identity location for VK test Moved from .mycroft to XDG folder commit 170ebc44ecf5cf3ceeaf44f282c992754b1bbc1b Merge: e40530a8ac b40fcf0e93 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Thu Aug 5 15:40:04 2021 +0930 Merge pull request #2951 from forslund/feature/then-wait-with-event-handler Use event handler to capture messages in then_wait() commit e40530a8ac57087ca59d4d14beb3a73b87c1988d Merge: 313f4e8759 4b66fb1dd1 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Thu Aug 5 15:39:12 2021 +0930 Merge pull request #2948 from forslund/bugfix/vk-message-race Fix Possible vk message race commit 313f4e87592222d40fdfb7d605ef4533b3f4267d Merge: c996008478 8f41d176d0 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Thu Aug 5 09:29:17 2021 +0930 Merge pull request #2946 from MycroftAI/refactor/vk-test-helpers Improve the speed of waiting for dialogs helper function commit c996008478917e7460a995b678d2239a50b24de8 Merge: 7c413de32c d14e6b65d7 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Aug 4 12:05:13 2021 +0930 Merge pull request #2944 from MycroftAI/bugfix/ci-unique-temp-paths Use unique paths for temp file storage commit 7c413de32c6916531b568faef8affa18d0475c5d Merge: c21e74d4d4 45d5d9e478 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Aug 4 11:42:45 2021 +0930 Merge pull request #2956 from AIIX/web_enable_request_feature Add feature request functionality to webviews commit c21e74d4d460f80a0f69571de3a426ddfe25f7df Merge: 480c604dfa b7a0853f3c Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Aug 3 15:25:57 2021 +0930 Merge pull request #2960 from MycroftAI/feature/upgrade-adapt Upgrade Adapt to v0.5.1 commit 480c604dfa53b87326116d81cb9e30d83f452f46 Merge: 450a092887 a794db0c9a Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Aug 3 07:55:47 2021 +0930 Merge pull request #2962 from MycroftAI/feature/configurable-network-tests Make network tests configurable commit a794db0c9a4b54c134a84cc209c7c9ff42134039 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Mon Aug 2 15:13:06 2021 +0930 Make network tests configurable Previously test URIs were hardcoded. They can now be configured in mycroft.conf commit b7a0853f3cb66ae12fe2df51be7cdfc2e9983594 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Jul 27 23:06:43 2021 +0930 Upgrade Adapt to v0.5.1 - Fix removal of regex entities - Update trie dosctrings - Guarantee sorted results from IntentDeterminationEngine - Enumerate all possible parse results if context or regex entities are in play. - Explicit test to assert results are sorted - Fix name of LICENSE file in Adapt package commit 450a0928874b30eb3e697514594140caa816f624 Merge: 1d03eadb59 24c4ba4a05 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Mon Jul 26 20:51:47 2021 +0930 Merge pull request #2957 from forslund/bugfix/load-audioservice-plugin Fix loading of audioservice plugins commit b40fcf0e938f726c9e5b427c6295ca029052468a Author: Åke Forslund <ake.forslund@gmail.com> Date: Thu Jul 22 21:07:02 2021 +0200 Update VK then step for checking messagetype Simplify the function and use the standard then_wait() for the heavy lifting, this makes it utilize the new event driven functionality. commit 171d3840f3ba2e696280d5d00dcb7908dc9c5b94 Author: Åke Forslund <ake.forslund@gmail.com> Date: Thu Jul 22 17:08:50 2021 +0200 Remove sleeps from end of scenarios and features commit 578a3ec439accb15bf70752e8302223ea57d2137 Author: Åke Forslund <ake.forslund@gmail.com> Date: Sun Jul 11 19:40:28 2021 +0200 Use event to capture messages in then_wait() Instead of busily polling the bus for new messages an event handler is registered (and teared down after check is complete) commit 24c4ba4a057c335045d70a2c734f93375ee8f034 Author: jarbasal <jarbasai@mailfence.com> Date: Thu Jul 22 20:31:23 2021 +0100 Fix loading of audioservice plugins commit 45d5d9e4787e86519d06ec6054843422ff1250f6 Author: Aditya Mehra <aix.m@outlook.com> Date: Fri Jul 23 15:14:06 2021 +0930 Add feature request functionality to webviews commit 1d03eadb5988258ec6d5b478f974b69c8e0bf0e2 Merge: d1816f5933 cbd17a8dc3 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Thu Jul 22 14:32:15 2021 -0500 Merge pull request #2954 from forslund/bugfix/vk-missing-stock-skill VK: Remove mycroft-stock from install list commit cbd17a8dc34f4bcbbed61dbca8275df7a9d73b8d Author: Åke Forslund <ake.forslund@gmail.com> Date: Thu Jul 22 17:15:12 2021 +0200 Remove mycroft-stock from install list commit d1816f593376c551d7b98a6a563696f861900435 Merge: 31e1e2d857 e0489a8488 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Wed Jul 14 09:43:49 2021 +0930 Merge pull request #2807 from forslund/test/jenkins-update-comment Add update comment logic to Jenkins commit 31e1e2d857d2804032dc65e9e18c0340d8dac880 Merge: b3a0b3b1e4 a211441acc Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Mon Jul 12 21:46:17 2021 +0930 Merge pull request #2927 from ChanceNCounter/fix/lang-none stop passing lang=None to Lingua Franca commit 8f41d176d069b751adbf5a3d61951963dda4d237 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Fri Jul 9 16:39:49 2021 -0500 remove print statement used for testing commit 6fd97b4e85b0cb2057b166f930c68e51ca85138d Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Fri Jul 9 15:45:07 2021 -0500 fixed PEP8 issue commit fbb1d06adc601a35e8d1d0ff2008b24f731c5cdb Merge: 4d7ed0f25e 105a5b4be4 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Fri Jul 9 15:43:25 2021 -0500 Merge remote-tracking branch 'origin/refactor/vk-test-helpers' into refactor/vk-test-helpers commit 4b66fb1dd1c8407eb3996561136dbea131334f1c Author: Åke Forslund <ake.forslund@gmail.com> Date: Fri Jul 9 16:47:30 2021 +0200 Add docstrings to InterceptAllBusClient commit cf355360addb7aa496fe6bfbe29a1177461533bb Author: Åke Forslund <ake.forslund@gmail.com> Date: Fri Jul 9 16:08:05 2021 +0200 Fix message race when using clear_messages() This handles a scenario that a message arrives between a call to get_messages() and clear_messages(). clear_messages() will only clear the messages that has been evaluated atleast once. A new method clear_all_messages() has been added to clear the entire message stack and is used between scenarios to reset the list. commit b3a0b3b1e4ed379ca2c242bca91ff30add176644 Merge: 10d1dcfe04 0ae02b5939 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Thu Jul 8 11:56:32 2021 +0930 Merge pull request #2938 from forslund/bugfix/tts-returned-cache-path Fix TTS using the returned path commit 10d1dcfe0495be5a02eefced543fa2bdcc511087 Merge: 2deab67021 18cb28088d Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Wed Jul 7 02:17:59 2021 -0500 Merge pull request #2945 from MycroftAI/refactor/race-condition-comment Added comments to document race condition commit 105a5b4be4b9d0b9518e780559bda9cdda3c0fab Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Tue Jul 6 14:26:23 2021 -0500 Improve the speed of waiting for dialogs by exiting the loop after a match is spoken. Also provide error handling for when a match is not found. commit 18cb28088d5da217eecd0bc39a0d83db88cc53b9 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Tue Jul 6 13:48:52 2021 -0500 Added comments to document race condition commit 2deab67021185ba72878e90573afe30b2fbb3b86 Merge: 80f9eb053c 28c52fef75 Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Jul 6 22:16:44 2021 +0930 Merge pull request #2943 from MycroftAI/feature/localization-fa-ir fa-ir localization initialized commit d14e6b65d73010fd7b383d15c41c7930d13af64f Author: Kris Gesling <kris.gesling@mycroft.ai> Date: Tue Jul 6 12:41:28 2021 +0930 Use unique paths for temp file storage When transferring the Allure report and the Mycroft logs to the report host, the zip files were being written to a common directory. In the event that multiple jobs were writing to or reading from this directory at the same time, conflicts could occur. This ensures that both zip files are written to unique paths and cleaned up afterward. commit 28c52fef756eea25f886a249820e20c7cff6464f Author: HKalbasi <45197576+HKalbasi@users.noreply.github.com> Date: Mon Jul 5 05:32:15 2021 +0430 fa-ir localization initialized (#2778) ==== Localization Notes ==== fa-ir: 35 strings added commit 80f9eb053c693f2fb23777e9c6630892ffb05aa0 Merge: 6099da18b3 3959267726 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Fri Jul 2 15:03:03 2021 -0500 Merge pull request #2937 from MycroftAI/bugfix/vk-race-condition Fix VK race condition in MycroftSkill.get_response() commit 0ae02b5939bd7ed8d110561f76e528e8d8c4006c Author: Åke Forslund <ake.forslund@gmail.com> Date: Fri Jul 2 08:08:30 2021 +0200 Fix TTS using the returned path commit 395926772699888a1a3a2f68442d7f89962385b4 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Thu Jul 1 22:31:22 2021 -0500 Reordered wait_while_speaking and sleep to fix a race condition that was occurring with the converse logic in MycroftSkill.get_response() commit a211441acc1799023d33c2787ac8ae879148fcfa Author: ChanceNCounter <ChanceNCounter@icloud.com> Date: Wed Jun 23 21:56:19 2021 -0700 stop passing lang=None to Lingua Franca LF's only breaking change over the past two versions has been the deprecation of `lang=None` as a valid parameter. This is because the new language loading paradigm wants to load certain functions on the fly, which it cannot do when it is explicitly told to look for a null lang. I've addressed this by passing `lingua_franca.get_default_lang()` where the `lang=None` call remained. Bonus: Gets rid of over 200 DeprecationWarnings in unit tests! commit 4d7ed0f25ecd468838b3fabbf21e1e3880c6a1c8 Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Sat Jun 5 13:39:57 2021 -0500 Added to docstring to explain why the method took a list of utterances instead of a single utterance. commit 2a9f63c1730f95c10fe2bf85bb2d5bc5afc4c91a Author: Chris Veilleux <veilleux.chris@gmail.com> Date: Sat Jun 5 12:15:02 2021 -0500 Fixed a bug where the highest confidence from the Adapt parser is different than the highest confidence from the Adapt intent matcher. commit e0489a8488f4412a4d081d233470797cec187b7d Author: Åke Forslund <ake.forslund@gmail.com> Date: Sun Jan 17 21:52:17 2021 +0100 Add update comment logic to Jenkins
Bash dependency maybe droped once scripts are simplified to support busybox. Relate-to: MycroftAI/mycroft-core#2686 Change-Id: Ibbb6c2e72f56f35ce475c045e52b4d4e56275348 Signed-off-by: Philippe Coval <rzr@users.sf.net> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Bash dependency maybe droped once scripts are simplified to support busybox. Relate-to: MycroftAI/mycroft-core#2686 Change-Id: Ibbb6c2e72f56f35ce475c045e52b4d4e56275348 Signed-off-by: Philippe Coval <rzr@users.sf.net> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Description
Makes the start and stop scripts POSIX sh compatible, and fixes any
shellcheck
issues found.This doesn't really depend on #2802, but without it
bin/mycroft-start
andbin/mycroft-stop
will break. Thus, #2802 should be merged first.How to test
Run all the usual variants of this test like normal (e.g.
./start-mycroft.sh
) and see if anything behaves differently than beforeContributor license agreement signed?
CLA [x] (Whether you have signed a CLA - Contributor Licensing Agreement