Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to support latest ovos-audio and ovos-plugin-manager #175

Merged
merged 6 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions neon_audio/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions requirements/docker.txt
Original file line number Diff line number Diff line change
@@ -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
7 changes: 3 additions & 4 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions requirements/test_requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Loading