From 9abccc499d936111846fae45f3bac197fa27dabc Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Thu, 14 Mar 2024 16:37:16 -0700 Subject: [PATCH 1/2] Add audio receiver dependencies to extras (currently manually handled in debos recipe) --- requirements/audio_receiver.txt | 3 +++ requirements/pi.txt | 2 ++ setup.py | 1 + 3 files changed, 6 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/requirements/pi.txt b/requirements/pi.txt index 879d05177..f9a361eee 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -61,4 +61,6 @@ ovos-skill-homescreen~=0.0.2,>=0.0.3a16 # ovos-skill-setup~=0.0.1 ovos-skill-volume~=0.0.1 + +# TODO: Remove below skill moved to `audio_receiver` extras skill-markII-audio-receiver~=0.1 diff --git a/setup.py b/setup.py index 80b7b8399..70192d95c 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 ee1150a3d7dae4c76b3fec072576402915ef98d3 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Thu, 14 Mar 2024 16:40:38 -0700 Subject: [PATCH 2/2] 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 70192d95c..397867682 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 5b927de5d..8c9dc4240 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 dcbb23a69..5f80a73de 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