From fd6ffa6c2127aab60ebe8692cb8ed75e3a72ec21 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:49:04 -0700 Subject: [PATCH] Update to support latest ovos-audio and ovos-plugin-manager (#175) # Description Update alpha dependencies to support latest stable releases of OVOS dependencies # Issues Related to https://github.com/NeonGeckoCom/NeonCore/pull/708 # Other Notes --------- Co-authored-by: Daniel McKnight --- .github/workflows/unit_tests.yml | 8 ++++---- neon_audio/utils.py | 4 ++++ requirements/docker.txt | 4 ++-- requirements/requirements.txt | 7 +++---- requirements/test_requirements.txt | 4 ++-- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 9bed051..ab7464c 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -39,16 +39,16 @@ jobs: env: TTS_URL: ${{secrets.tts_url}} - name: Upload Unit test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: unit-test-results + name: unit-test-results-${{matrix.python-version}} path: tests/unit-test-results.xml - name: Test API Methods run: | pytest tests/api_method_tests.py --doctest-modules --junitxml=tests/api-method-test-results.xml - name: Upload API Method test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: api-method-test-results + name: api-method-test-results-${{matrix.python-version}} path: tests/api-method-test-results.xml diff --git a/neon_audio/utils.py b/neon_audio/utils.py index 6a2b090..24227f6 100644 --- a/neon_audio/utils.py +++ b/neon_audio/utils.py @@ -89,6 +89,10 @@ def install_tts_plugin(plugin: str) -> bool: LOG.info(f"Constraints={constraints}") LOG.info(f"Requested installation of plugin: {plugin}") returned = pip.main(['install', _plugin_to_package(plugin), "-c", tmp_file]) + if returned != 0: + LOG.warning(f"Installation failed. attempting with pre-release enabled") + returned = pip.main(['install', '--pre', _plugin_to_package(plugin), + "-c", tmp_file]) LOG.info(f"pip status: {returned}") return returned == 0 diff --git a/requirements/docker.txt b/requirements/docker.txt index fe87f22..dfc92ef 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -1,4 +1,4 @@ # Install default plugins -neon-lang-plugin-libretranslate~=0.2 +neon-lang-plugin-libretranslate~=0.2,>=0.2.1a2 ovos-tts-plugin-mimic~=0.2 -neon-tts-plugin-coqui~=0.7 +neon-tts-plugin-coqui~=0.7,>=0.8.1a3 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 4c0f809..a7a2da9 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,16 +1,15 @@ -ovos-audio~=0.0.2a42 +ovos-audio~=0.2 ovos-utils>=0.0.35,<0.2.0 ovos-config~=0.0.10 phoneme-guesser~=0.1 -# TODO: Alpha patching ovos-audio dependency resolution -ovos-plugin-manager~=0.0.24,>=0.0.26a16,<0.0.26a21 +ovos-plugin-manager~=0.0,>=0.0.26 neon-utils[network]~=1.9 click~=8.0 click-default-group~=1.2 ovos-bus-client~=0.0.3 # Default OCP backend + plugins -ovos-plugin-common-play~=0.0.6 +ovos-plugin-common-play~=0.1 ovos-ocp-m3u-plugin~=0.0.1 ovos-ocp-rss-plugin~=0.0.2 ovos-ocp-files-plugin~=0.13 diff --git a/requirements/test_requirements.txt b/requirements/test_requirements.txt index 703bce8..2ee5508 100644 --- a/requirements/test_requirements.txt +++ b/requirements/test_requirements.txt @@ -1,3 +1,3 @@ -neon-tts-plugin-larynx-server~=0.1 -neon-lang-plugin-libretranslate~=0.1,>=0.1.2 +neon-tts-plugin-larynx-server~=0.1,>=0.2.1a1 +neon-lang-plugin-libretranslate~=0.1,>=0.2.1a2 pytest~=7.2 \ No newline at end of file