From 7a5e1ae57d90efe11d333ac74e598a7767f9f1f8 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Mon, 26 Feb 2024 12:25:25 -0800 Subject: [PATCH] Remove alpha dependencies to validate stable release (#618) Co-authored-by: Daniel McKnight --- requirements/core_modules.txt | 6 ++--- requirements/docker.txt | 3 --- requirements/local_speech_processing.txt | 2 +- requirements/pi.txt | 28 ++++++++++----------- requirements/requirements.txt | 13 +++++----- requirements/skills_default.txt | 32 ++++++++++++------------ requirements/skills_essential.txt | 8 +++--- requirements/skills_extended.txt | 12 ++++----- 8 files changed, 50 insertions(+), 54 deletions(-) diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index 6defcbb91..1c51ea491 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -1,6 +1,6 @@ # neon core modules neon_messagebus~=2.0,>=2.0.1 -neon_enclosure~=1.6,>=1.6.2a1 -neon_speech~=4.3 +neon_enclosure==1.6.2 # TODO: This is a yanked release because it depends on an alpha ovos-backend-client +neon_speech~=4.3 #,>=4.3.1a2 neon_gui~=1.2,>=1.2.2 -neon_audio~=1.5,>=1.5.1a3 +neon_audio~=1.5,>=1.5.1 diff --git a/requirements/docker.txt b/requirements/docker.txt index 19d70ce88..d00ad5b2b 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -3,6 +3,3 @@ ovos-tts-plugin-mimic # "Lite" homescreen disables edge-device functionality ovos-skill-homescreen-lite @ git+https://github.com/openvoiceos/skill-homescreen-lite - -# TODO: Pinned to resolve install issue with PyICU introduced in 0.0.0a51 -ovos-classifiers==0.0.0a50 \ No newline at end of file diff --git a/requirements/local_speech_processing.txt b/requirements/local_speech_processing.txt index 60404edfa..36a9b6cc3 100644 --- a/requirements/local_speech_processing.txt +++ b/requirements/local_speech_processing.txt @@ -1,6 +1,6 @@ neon-stt-plugin-deepspeech-stream-local~=2.0 neon-stt-plugin-nemo~=0.0 -neon-tts-plugin-coqui~=0.7,>=0.7.3a4 +neon-tts-plugin-coqui~=0.8 onnxruntime!=1.16.0 # TODO: Patching https://github.com/microsoft/onnxruntime/issues/17631 # TODO: Local language plugin diff --git a/requirements/pi.txt b/requirements/pi.txt index dbebfd255..f7c85b146 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -21,7 +21,7 @@ neon-stt-plugin-google-cloud-streaming~=1.0,>=1.0.1 neon-tts-plugin-coqui-remote~=0.0.3 neon-stt-plugin-nemo~=0.0.4 -ovos-tts-plugin-server~=0.0.0,>=0.0.2a4 +ovos-tts-plugin-server==0.0.2a12 # Fallback plugins neon-tts-plugin-coqui~=0.7,>=0.7.3a4 @@ -37,32 +37,30 @@ neon-phal-plugin-fan~=0.1 neon-phal-plugin-switches~=0.0.4 neon-phal-plugin-linear_led~=0.2,>=0.2.2 ovos-phal-plugin-balena-wifi~=1.0.0 -neon-phal-plugin-gui-network-client~=0.0.3,>=0.0.4a1 +neon-phal-plugin-gui-network-client~=0.0.4 ovos-phal-plugin-network-manager~=1.1 -ovos-phal-plugin-wifi-setup~=1.1,>=1.1.2a1 -ovos-phal-plugin-oauth~=0.0.2,>=0.0.3a2 +ovos-phal-plugin-wifi-setup==1.1.2a1 +ovos-phal-plugin-oauth==0.0.3a2 ovos-phal-plugin-alsa~=0.0.3 -ovos-phal-plugin-system~=0.0.4,>=0.0.5a1 +ovos-phal-plugin-system~=0.0.4 #,>=0.0.5a1 ovos-phal-plugin-connectivity-events~=0.0.3 -ovos-phal-plugin-homeassistant~=0.0.3,>=0.0.4a5 +ovos-phal-plugin-homeassistant~=0.0.3 #,>=0.0.4a5 ovos-phal-plugin-wallpaper-manager~=0.0.1 ovos-phal-plugin-ipgeo~=0.0.2 -ovos-phal-plugin-mk1 @ git+https://github.com/openvoiceos/ovos-phal-plugin-mk1@dev +# ovos-phal-plugin-mk1 @ git+https://github.com/openvoiceos/ovos-phal-plugin-mk1@dev # TODO: Stable spec for mk1 plugin # ovos-phal-plugin-gpsd @ git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-gpsd -ovos-gui-plugin-shell-companion~=0.0.0,>=0.0.1a4 +ovos-gui-plugin-shell-companion==0.0.1a5 # Pi-specific skills -neon-skill-core_ready~=0.0.1,>=0.0.2a1 -neon-skill-update~=2.1,>=2.1.3a1 -# ovos-skill-homescreen~=0.0.2,>=0.0.3a6 -ovos-skill-homescreen==0.0.3a6 +neon-skill-core_ready~=0.0.1 #,>=0.0.2a1 +neon-skill-update~=2.1 #,>=2.1.3a1 +# ovos-skill-homescreen~=0.0.2,>=0.0.3a16 +ovos-skill-homescreen==0.0.3a16 + # ovos-skill-setup~=0.0.1 ovos-skill-volume~=0.0.1 skill-markII-audio-receiver~=0.1 -# TODO: Pinned to resolve install issue with PyICU introduced in 0.0.0a51 -ovos-classifiers==0.0.0a50 - # Backwards-compat ovos-skills-manager~=0.0.13 # TODO: Remove in 2024 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 296b1031e..691126e04 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -2,15 +2,16 @@ ovos-core==0.0.7 # padacioso==0.1.3a2 -# TODO: Audio for alpha resolution -neon-utils[network,audio]~=1.8,>=1.8.3a2 +# # TODO: Audio for alpha resolution +neon-utils[network,audio]~=1.8,>=1.8.3a5 ovos-utils~=0.0.38 ovos-bus-client~=0.0.8 neon-transformers~=0.2 ovos-config~=0.0.12 ovos-plugin-manager~=0.0.25 -ovos-backend-client~=0.1,>=0.1.1a2 +# ovos-backend-client~=0.1,>=0.1.1a2 +ovos-backend-client==0.1.1a5 # TODO psutil~=5.6 click~=8.0 @@ -24,14 +25,14 @@ neon-lang-plugin-libretranslate~=0.2 neon-utterance-translator-plugin~=0.2 neon-utterance-normalizer-plugin~=0.1 -# TODO: Patching test failures https://github.com/NeonGeckoCom/NeonCore/actions/runs/4888865255/jobs/8727164992?pr=422 -requests < 2.30.0 +requests~=2.29 # TODO: Patching dependencies ovos-core[skills,skills_lgpl] extra deps adapt-parser~=0.5 padacioso~=0.1 -ovos-lingua-franca~=0.4.8a7 +ovos-lingua-franca==0.4.8a7 # TODO +ovos-classifiers==0.0.0a53 # TODO ovos-phal-plugin-connectivity-events~=0.0.1 padatious~=0.4.8 fann2==1.0.7 diff --git a/requirements/skills_default.txt b/requirements/skills_default.txt index 4916c8251..4087962fc 100644 --- a/requirements/skills_default.txt +++ b/requirements/skills_default.txt @@ -1,18 +1,18 @@ skill-ddg==0.0.2a3 -neon-skill-alerts~=2.0,>=2.0.1a4 -neon-skill-caffeinewiz~=1.0,>=1.0.1a4 -neon-skill-data_controls~=2.0,>=2.0.1a2 -neon-skill-fallback_wolfram_alpha~=1.0,>=1.0.1a1 -neon-skill-personal~=1.0,>=1.0.1a3 -neon-skill-speak~=2.0,>=2.0.1a1 -neon-skill-speed_test~=1.0,>=1.0.2a1 -neon-skill-spelling~=1.0,>=1.0.1a1 -neon-skill-stock~=1.0,>=1.0.1a1 -neon-skill-support_helper~=1.2,>=1.2.2a1 -neon-skill-user_settings~=1.0,>=1.0.5a2 -neon-skill-weather~=1.0,>=1.0.2a1 -neon-skill-wikipedia~=1.0,>=1.0.2a1 -neon-skill-free_music_archive~=1.0,>=1.0.1a1 -neon-skill-local_music~=2.0,>=2.0.1a1 +neon-skill-alerts~=2.0 #,>=2.0.1a4 +neon-skill-caffeinewiz~=1.0 #,>=1.0.1a4 +neon-skill-data_controls~=2.0 #,>=2.0.1a2 +neon-skill-fallback_wolfram_alpha~=1.0 #,>=1.0.1a1 +neon-skill-personal~=1.0 #,>=1.0.1a3 +neon-skill-speak~=2.0 #,>=2.0.1a1 +neon-skill-speed_test~=1.0,>=1.0.1 #,>=1.0.2a1 +neon-skill-spelling~=1.0 #,>=1.0.1a1 +neon-skill-stock~=1.0 #,>=1.0.1a1 +neon-skill-support_helper~=1.2,>=1.2.1 #,>=1.2.2a1 +neon-skill-user_settings~=1.0 #,>=1.0.5a2 +neon-skill-weather~=1.0,>=1.0.1 #,>=1.0.2a1 +neon-skill-wikipedia~=1.0,>=1.0.1 #,>=1.0.2a1 +neon-skill-free_music_archive~=1.0 #,>=1.0.1a1 +neon-skill-local_music~=2.0 #,>=2.0.1a1 # neon-skill-holidays~=0.0.0a1 -neon-skill-fallback_llm~=1.0,>=1.0.2a2 +neon-skill-fallback_llm~=1.0,>=1.0.1 #,>=1.0.2a2 diff --git a/requirements/skills_essential.txt b/requirements/skills_essential.txt index cc5ab5490..8a9aa5a9c 100644 --- a/requirements/skills_essential.txt +++ b/requirements/skills_essential.txt @@ -1,5 +1,5 @@ -neon-skill-about~=1.0,>=1.0.1a1 -neon-skill-date_time~=1.0,>=1.0.1a6 +neon-skill-about~=1.0 #,>=1.0.1a1 +neon-skill-date_time~=1.0 #,>=1.0.1a6 neon-skill-demo~=1.0,>=1.0.2 -neon-skill-device_controls~=1.0,>=1.0.1a5 -neon-skill-ip_address~=1.1,>=1.1.1a3 \ No newline at end of file +neon-skill-device_controls~=1.0 #,>=1.0.1a5 +neon-skill-ip_address~=1.1 #,>=1.1.1a3 \ No newline at end of file diff --git a/requirements/skills_extended.txt b/requirements/skills_extended.txt index ac877046e..66a8f1eb0 100644 --- a/requirements/skills_extended.txt +++ b/requirements/skills_extended.txt @@ -1,12 +1,12 @@ -neon-skill-audio_record~=1.0,>=1.0.1a1 +neon-skill-audio_record~=1.0 #,>=1.0.1a1 # neon-skill-custom_conversation>=0.0.1a8,<0.0.2 -neon-skill-instructions~=0.1,>=0.1.1a3 -neon-skill-launcher~=1.0,>=1.0.1a1 +neon-skill-instructions~=0.1 #,>=0.1.1a3 +neon-skill-launcher~=1.0 #,>=1.0.1a1 skill-news~=0.0.3 # neon-skill-recipes>=0.0.1a8 -neon-skill-synonyms~=1.0,>=1.0.2a2 -neon-skill-translation~=1.0,>=1.0.1a2 -neon-skill-camera~=1.0,>=1.0.1a1 +neon-skill-synonyms~=1.0, >=1.0.1 #,>=1.0.2a2 +neon-skill-translation~=1.0 #,>=1.0.1a2 +neon-skill-camera~=1.0 #,>=1.0.1a1 ovos-skill-somafm~=0.0.1 neon-homeassistant-skill~=0.0.16 ovos-skill-jokes @ git+https://github.com/openvoiceos/skill-ovos-icanhazdadjokes@ad20ee400c7195cfdb43596f32b1c0a4293ce941 \ No newline at end of file