From ebbc7e67d741bea8bbf5bc8dd2f04b091ace8199 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Thu, 14 Mar 2024 16:37:16 -0700 Subject: [PATCH 01/11] Add audio receiver dependencies to extras (currently manually handled in debos recipe) --- requirements/audio_receiver.txt | 3 +++ setup.py | 1 + 2 files changed, 4 insertions(+) create mode 100644 requirements/audio_receiver.txt diff --git a/requirements/audio_receiver.txt b/requirements/audio_receiver.txt new file mode 100644 index 000000000..20e1e6ae2 --- /dev/null +++ b/requirements/audio_receiver.txt @@ -0,0 +1,3 @@ +skill-markII-audio-receiver~=0.1 +PyBluez~=0.23 +PyGObject~=3.44 \ No newline at end of file diff --git a/setup.py b/setup.py index d12ae17b8..7a0be7e9e 100644 --- a/setup.py +++ b/setup.py @@ -100,6 +100,7 @@ def get_requirements(requirements_filename: str): "skills-essential": get_requirements("skills_essential.txt"), "skills-default": get_requirements("skills_default.txt"), "skills-extended": get_requirements("skills_extended.txt"), + "audio-receiver": get_requirements("audio_receiver") }, packages=find_packages(include=['neon_core*']), package_data={'neon_core': ['res/precise_models/*', 'res/snd/*', From 772e7b8cb7b45763432d1513f5b58728a546b587 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Thu, 14 Mar 2024 16:40:38 -0700 Subject: [PATCH 02/11] Update tests fix typo in setup.py --- setup.py | 2 +- test/pi_setup_3_10.sh | 2 +- test/pi_setup_3_11.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 7a0be7e9e..bb650621e 100644 --- a/setup.py +++ b/setup.py @@ -100,7 +100,7 @@ def get_requirements(requirements_filename: str): "skills-essential": get_requirements("skills_essential.txt"), "skills-default": get_requirements("skills_default.txt"), "skills-extended": get_requirements("skills_extended.txt"), - "audio-receiver": get_requirements("audio_receiver") + "audio-receiver": get_requirements("audio_receiver.txt") }, packages=find_packages(include=['neon_core*']), package_data={'neon_core': ['res/precise_models/*', 'res/snd/*', diff --git a/test/pi_setup_3_10.sh b/test/pi_setup_3_10.sh index 8d754538a..20523d855 100644 --- a/test/pi_setup_3_10.sh +++ b/test/pi_setup_3_10.sh @@ -44,6 +44,6 @@ python3.10 -m venv "/core/venv" || exit 11 . /core/venv/bin/activate pip install --upgrade pip wheel -pip install ".[core_modules,skills_required,skills_essential,skills_default,skills_extended,pi]" || exit 11 +pip install ".[core-modules,skills-required,skills-essential,skills-default,skills-extended,pi,audio-receiver]" || exit 11 cp -rf /core/test/pi_image_overlay/* / \ No newline at end of file diff --git a/test/pi_setup_3_11.sh b/test/pi_setup_3_11.sh index bc03f7040..9b88efac7 100644 --- a/test/pi_setup_3_11.sh +++ b/test/pi_setup_3_11.sh @@ -46,6 +46,6 @@ python3.11 -m venv "/core/venv" || exit 11 pip install --upgrade pip wheel pip install https://github.com/smartgic/python-tflite-runtime/releases/download/2.13.0-cp311/tflite_runtime-2.13.0-cp311-cp311-linux_aarch64.whl #pip install https://whl.smartgic.io/tflite_runtime-2.13.0-cp311-cp311-linux_aarch64.whl -pip install ".[core_modules,skills_required,skills_essential,skills_default,skills_extended,pi]" || exit 11 +pip install ".[core-modules,skills-required,skills-essential,skills-default,skills-extended,pi,audio-receiver]" || exit 11 cp -rf /core/test/pi_image_overlay/* / \ No newline at end of file From c9e041a31210c1131a07068d9fa0128a7efd1862 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 11 Aug 2025 12:50:37 -0700 Subject: [PATCH 03/11] Remove mark2 Audio Receiver app moved to audio_receiver extras --- requirements/pi.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/pi.txt b/requirements/pi.txt index 0af3b11f1..9553db219 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -60,7 +60,6 @@ ovos-skill-homescreen~=0.0.3 # ovos-skill-setup~=0.0.1 ovos-skill-volume~=0.0.2 -skill-markII-audio-receiver~=0.1 # Used for Demo Skill ovos-tts-plugin-mimic~=0.3 From 444a8a1c3236f455e41f12ed8f9511bb4e0509d3 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 11 Aug 2025 13:01:51 -0700 Subject: [PATCH 04/11] Add cairo apt dependency to Pi Image tests --- test/pi_setup_3_10.sh | 4 ++-- test/pi_setup_3_11.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/pi_setup_3_10.sh b/test/pi_setup_3_10.sh index 20523d855..c4f0730be 100644 --- a/test/pi_setup_3_10.sh +++ b/test/pi_setup_3_10.sh @@ -37,7 +37,7 @@ apt install -y curl curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key | apt-key add - 2> /dev/null && \ echo "deb http://forslund.github.io/mycroft-desktop-repo bionic main" | tee /etc/apt/sources.list.d/mycroft-desktop.list apt update -apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make || exit 1 +apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make libcairo2-dev || exit 1 cd /core || exit 10 python3.10 -m venv "/core/venv" || exit 11 @@ -46,4 +46,4 @@ python3.10 -m venv "/core/venv" || exit 11 pip install --upgrade pip wheel pip install ".[core-modules,skills-required,skills-essential,skills-default,skills-extended,pi,audio-receiver]" || exit 11 -cp -rf /core/test/pi_image_overlay/* / \ No newline at end of file +cp -rf /core/test/pi_image_overlay/* / diff --git a/test/pi_setup_3_11.sh b/test/pi_setup_3_11.sh index 9b88efac7..98439f152 100644 --- a/test/pi_setup_3_11.sh +++ b/test/pi_setup_3_11.sh @@ -37,7 +37,7 @@ apt install -y curl curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key | apt-key add - 2> /dev/null && \ echo "deb http://forslund.github.io/mycroft-desktop-repo bionic main" | tee /etc/apt/sources.list.d/mycroft-desktop.list apt update -apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make python3.11-dev python3.11-venv || exit 1 +apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make python3.11-dev python3.11-venv libcairo2-dev || exit 1 cd /core || exit 10 python3.11 -m venv "/core/venv" || exit 11 @@ -48,4 +48,4 @@ pip install https://github.com/smartgic/python-tflite-runtime/releases/download/ #pip install https://whl.smartgic.io/tflite_runtime-2.13.0-cp311-cp311-linux_aarch64.whl pip install ".[core-modules,skills-required,skills-essential,skills-default,skills-extended,pi,audio-receiver]" || exit 11 -cp -rf /core/test/pi_image_overlay/* / \ No newline at end of file +cp -rf /core/test/pi_image_overlay/* / From d1492b170da99693d38f20e1debee01a71365126 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 11 Aug 2025 13:13:08 -0700 Subject: [PATCH 05/11] Troubleshooting Pi Setup test failures --- test/pi_setup_3_10.sh | 2 +- test/pi_setup_3_11.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/pi_setup_3_10.sh b/test/pi_setup_3_10.sh index c4f0730be..d7b61a684 100644 --- a/test/pi_setup_3_10.sh +++ b/test/pi_setup_3_10.sh @@ -37,7 +37,7 @@ apt install -y curl curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key | apt-key add - 2> /dev/null && \ echo "deb http://forslund.github.io/mycroft-desktop-repo bionic main" | tee /etc/apt/sources.list.d/mycroft-desktop.list apt update -apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make libcairo2-dev || exit 1 +apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make libcairo2-dev libgirepository1.0-dev || exit 1 cd /core || exit 10 python3.10 -m venv "/core/venv" || exit 11 diff --git a/test/pi_setup_3_11.sh b/test/pi_setup_3_11.sh index 98439f152..32c141ede 100644 --- a/test/pi_setup_3_11.sh +++ b/test/pi_setup_3_11.sh @@ -37,7 +37,7 @@ apt install -y curl curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key | apt-key add - 2> /dev/null && \ echo "deb http://forslund.github.io/mycroft-desktop-repo bionic main" | tee /etc/apt/sources.list.d/mycroft-desktop.list apt update -apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make python3.11-dev python3.11-venv libcairo2-dev || exit 1 +apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make python3.11-dev python3.11-venv libcairo2-dev libgirepository1.0-dev || exit 1 cd /core || exit 10 python3.11 -m venv "/core/venv" || exit 11 @@ -46,6 +46,6 @@ python3.11 -m venv "/core/venv" || exit 11 pip install --upgrade pip wheel pip install https://github.com/smartgic/python-tflite-runtime/releases/download/2.13.0-cp311/tflite_runtime-2.13.0-cp311-cp311-linux_aarch64.whl #pip install https://whl.smartgic.io/tflite_runtime-2.13.0-cp311-cp311-linux_aarch64.whl -pip install ".[core-modules,skills-required,skills-essential,skills-default,skills-extended,pi,audio-receiver]" || exit 11 +pip install ".[core-modules,skills-required,skills-essential,skills-default,skills-extended,pi]" || exit 11 cp -rf /core/test/pi_image_overlay/* / From 9910d27ea1e0dc9a59369dd1e211b3f2f9e1eaf6 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 11 Aug 2025 13:22:23 -0700 Subject: [PATCH 06/11] Fix libgitrepository apt version typo --- test/pi_setup_3_10.sh | 2 +- test/pi_setup_3_11.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pi_setup_3_10.sh b/test/pi_setup_3_10.sh index d7b61a684..60c9f927d 100644 --- a/test/pi_setup_3_10.sh +++ b/test/pi_setup_3_10.sh @@ -37,7 +37,7 @@ apt install -y curl curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key | apt-key add - 2> /dev/null && \ echo "deb http://forslund.github.io/mycroft-desktop-repo bionic main" | tee /etc/apt/sources.list.d/mycroft-desktop.list apt update -apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make libcairo2-dev libgirepository1.0-dev || exit 1 +apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make libcairo2-dev libgirepository2.0-dev || exit 1 cd /core || exit 10 python3.10 -m venv "/core/venv" || exit 11 diff --git a/test/pi_setup_3_11.sh b/test/pi_setup_3_11.sh index 32c141ede..75cd666da 100644 --- a/test/pi_setup_3_11.sh +++ b/test/pi_setup_3_11.sh @@ -37,7 +37,7 @@ apt install -y curl curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key | apt-key add - 2> /dev/null && \ echo "deb http://forslund.github.io/mycroft-desktop-repo bionic main" | tee /etc/apt/sources.list.d/mycroft-desktop.list apt update -apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make python3.11-dev python3.11-venv libcairo2-dev libgirepository1.0-dev || exit 1 +apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make python3.11-dev python3.11-venv libcairo2-dev libgirepository2.0-dev || exit 1 cd /core || exit 10 python3.11 -m venv "/core/venv" || exit 11 From ade7bc964d1851927e1d2e177ae6ac003362cf97 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 11 Aug 2025 13:29:14 -0700 Subject: [PATCH 07/11] Revert invalid `libgitrepository` apt dependency spec --- test/pi_setup_3_10.sh | 2 +- test/pi_setup_3_11.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pi_setup_3_10.sh b/test/pi_setup_3_10.sh index 60c9f927d..d7b61a684 100644 --- a/test/pi_setup_3_10.sh +++ b/test/pi_setup_3_10.sh @@ -37,7 +37,7 @@ apt install -y curl curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key | apt-key add - 2> /dev/null && \ echo "deb http://forslund.github.io/mycroft-desktop-repo bionic main" | tee /etc/apt/sources.list.d/mycroft-desktop.list apt update -apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make libcairo2-dev libgirepository2.0-dev || exit 1 +apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make libcairo2-dev libgirepository1.0-dev || exit 1 cd /core || exit 10 python3.10 -m venv "/core/venv" || exit 11 diff --git a/test/pi_setup_3_11.sh b/test/pi_setup_3_11.sh index 75cd666da..32c141ede 100644 --- a/test/pi_setup_3_11.sh +++ b/test/pi_setup_3_11.sh @@ -37,7 +37,7 @@ apt install -y curl curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key | apt-key add - 2> /dev/null && \ echo "deb http://forslund.github.io/mycroft-desktop-repo bionic main" | tee /etc/apt/sources.list.d/mycroft-desktop.list apt update -apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make python3.11-dev python3.11-venv libcairo2-dev libgirepository2.0-dev || exit 1 +apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make python3.11-dev python3.11-venv libcairo2-dev libgirepository1.0-dev || exit 1 cd /core || exit 10 python3.11 -m venv "/core/venv" || exit 11 From 4c62f7d45d5a12a3efa9604af54e575bb5fed4d7 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 11 Aug 2025 13:40:26 -0700 Subject: [PATCH 08/11] Troubleshooting GHA failure --- requirements/audio_receiver.txt | 2 +- test/pi_setup_3_10.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/audio_receiver.txt b/requirements/audio_receiver.txt index 20e1e6ae2..e95c4af81 100644 --- a/requirements/audio_receiver.txt +++ b/requirements/audio_receiver.txt @@ -1,3 +1,3 @@ skill-markII-audio-receiver~=0.1 PyBluez~=0.23 -PyGObject~=3.44 \ No newline at end of file +PyGObject~=3.44.1 diff --git a/test/pi_setup_3_10.sh b/test/pi_setup_3_10.sh index d7b61a684..2c09b8e6f 100644 --- a/test/pi_setup_3_10.sh +++ b/test/pi_setup_3_10.sh @@ -38,6 +38,7 @@ curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key | a echo "deb http://forslund.github.io/mycroft-desktop-repo bionic main" | tee /etc/apt/sources.list.d/mycroft-desktop.list apt update apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make libcairo2-dev libgirepository1.0-dev || exit 1 +find /usr/lib /usr/lib/aarch64-linux-gnu -name girepository-2.0.pc cd /core || exit 10 python3.10 -m venv "/core/venv" || exit 11 From 56aea1a57791233f58ab0e63a5d5069cb9975bbd Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 11 Aug 2025 13:55:32 -0700 Subject: [PATCH 09/11] Update audio-receiver dependencies --- test/pi_setup_3_10.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/pi_setup_3_10.sh b/test/pi_setup_3_10.sh index 2c09b8e6f..b40259d33 100644 --- a/test/pi_setup_3_10.sh +++ b/test/pi_setup_3_10.sh @@ -33,12 +33,17 @@ echo "nameserver 1.1.1.1" | tee /etc/resolv.conf # install system packages apt update -apt install -y curl +apt install -y curl apt-utils curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key | apt-key add - 2> /dev/null && \ echo "deb http://forslund.github.io/mycroft-desktop-repo bionic main" | tee /etc/apt/sources.list.d/mycroft-desktop.list apt update -apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make libcairo2-dev libgirepository1.0-dev || exit 1 -find /usr/lib /usr/lib/aarch64-linux-gnu -name girepository-2.0.pc +apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse-dev mimic espeak-ng g++ libjpeg-dev make || exit 1 +# Audio Receiver dependencies +apt install -y libcairo2-dev libgirepository1.0-dev bluez* libbluetooth-dev pulseaudio-module-bluetooth + +# TODO: For troubleshooting GHA failure +find /usr/lib /usr/lib/aarch64-linux-gnu -name girepository-2.0.pc || echo "girepository-2.0.pc not found" + cd /core || exit 10 python3.10 -m venv "/core/venv" || exit 11 From 297a746cbd152f9223975c431deb614b7277a9e6 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 11 Aug 2025 14:21:57 -0700 Subject: [PATCH 10/11] Revert changes used to debug Pi Image GHA --- test/pi_setup_3_10.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/pi_setup_3_10.sh b/test/pi_setup_3_10.sh index b40259d33..fcba443d2 100644 --- a/test/pi_setup_3_10.sh +++ b/test/pi_setup_3_10.sh @@ -33,7 +33,7 @@ echo "nameserver 1.1.1.1" | tee /etc/resolv.conf # install system packages apt update -apt install -y curl apt-utils +apt install -y curl curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key | apt-key add - 2> /dev/null && \ echo "deb http://forslund.github.io/mycroft-desktop-repo bionic main" | tee /etc/apt/sources.list.d/mycroft-desktop.list apt update @@ -41,10 +41,6 @@ apt install -y sox gcc libfann-dev swig libssl-dev portaudio19-dev git libpulse- # Audio Receiver dependencies apt install -y libcairo2-dev libgirepository1.0-dev bluez* libbluetooth-dev pulseaudio-module-bluetooth -# TODO: For troubleshooting GHA failure -find /usr/lib /usr/lib/aarch64-linux-gnu -name girepository-2.0.pc || echo "girepository-2.0.pc not found" - - cd /core || exit 10 python3.10 -m venv "/core/venv" || exit 11 . /core/venv/bin/activate From a3d0b79c21f4e6fb4a36b4e10ae06739999d24a2 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 11 Aug 2025 15:39:06 -0700 Subject: [PATCH 11/11] Add back audio receiver to pi extras for backwards-compat --- requirements/pi.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements/pi.txt b/requirements/pi.txt index 9553db219..de2fc76f5 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -61,5 +61,8 @@ ovos-skill-homescreen~=0.0.3 # ovos-skill-setup~=0.0.1 ovos-skill-volume~=0.0.2 +# Included in `audio-receiver` extras, but here for Mark II backwards-compat +skill-markII-audio-receiver~=0.1 + # Used for Demo Skill ovos-tts-plugin-mimic~=0.3