diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index d13dfed09e0..f1972906b18 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -40,4 +40,4 @@ jobs: python setup.py bdist_wheel - name: Install package run: | - pip install .[mycroft,lgpl,plugins,skills-essential,skills-audio,skills-gui,skills-internet,skills-media,skills-desktop] ovos-gui==1.0.0 + pip install .[mycroft,lgpl,plugins,skills-essential,skills-audio,skills-gui,skills-internet,skills-media,skills-desktop] diff --git a/.github/workflows/constraint_tests.yml b/.github/workflows/constraint_tests.yml new file mode 100644 index 00000000000..37e6898761d --- /dev/null +++ b/.github/workflows/constraint_tests.yml @@ -0,0 +1,45 @@ +name: Test Constraints + +on: + workflow_dispatch: + pull_request: + paths: + - 'requirements/requirements.txt' + - 'requirements/lgpl.txt' + - 'requirements/mycroft.txt' + - 'requirements/plugins.txt' + - 'requirements/skills-audio.txt' + - 'requirements/skills-desktop.txt' + - 'requirements/skills-essential.txt' + - 'requirements/skills-gui.txt' + - 'requirements/skills-internet.txt' + - 'requirements/skills-media.txt' + +jobs: + test-stable-and-testing-constraints: + runs-on: ubuntu-latest + strategy: + matrix: + constraints_file: ['testing'] + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.8' + + - name: Install System Dependencies + run: | + sudo apt-get update + sudo apt install python3-dev swig libssl-dev portaudio19-dev libpulse-dev libfann-dev + + - name: Download constraints file + run: | + curl -o requirements/constraints-${{ matrix.constraints_file }}.txt https://raw.githubusercontent.com/OpenVoiceOS/ovos-releases/refs/heads/main/constraints-${{ matrix.constraints_file }}.txt + + - name: Install core repo with constraints + run: | + pip install -e .[mycroft,lgpl,plugins,skills-essential,skills-audio,skills-gui,skills-internet,skills-media,skills-desktop] --pre -c requirements/constraints-${{ matrix.constraints_file }}.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 95b82127b19..75c2db48d37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,20 +1,24 @@ # Changelog -## [0.2.8a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.8a1) (2024-11-06) +## [0.2.10a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.10a1) (2024-11-11) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.7a1...0.2.8a1) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.9a1...0.2.10a1) + +**Closed issues:** + +- deprecate lingua franca [\#592](https://github.com/OpenVoiceOS/ovos-core/issues/592) **Merged pull requests:** -- fix: allow latest bus client version [\#588](https://github.com/OpenVoiceOS/ovos-core/pull/588) ([JarbasAl](https://github.com/JarbasAl)) +- fix: drop lingua\_franca [\#593](https://github.com/OpenVoiceOS/ovos-core/pull/593) ([JarbasAl](https://github.com/JarbasAl)) -## [0.2.7a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.7a1) (2024-11-02) +## [0.2.9a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.9a1) (2024-11-06) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.6...0.2.7a1) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.8...0.2.9a1) **Merged pull requests:** -- da-dk/translate [\#583](https://github.com/OpenVoiceOS/ovos-core/pull/583) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app)) +- chore: release\_tests [\#590](https://github.com/OpenVoiceOS/ovos-core/pull/590) ([JarbasAl](https://github.com/JarbasAl)) diff --git a/ovos_core/intent_services/__init__.py b/ovos_core/intent_services/__init__.py index d816e3a40e8..a22c518b333 100644 --- a/ovos_core/intent_services/__init__.py +++ b/ovos_core/intent_services/__init__.py @@ -331,11 +331,6 @@ def handle_utterance(self, message: Message): # tag language of this utterance lang = self.disambiguate_lang(message) - try: # TODO - uncouple lingua franca from core, up to skills to ensure locale is loaded if needed - setup_locale(lang) - except Exception as e: - LOG.exception(f"Failed to set lingua_franca default lang to {lang}") - utterances = message.data.get('utterances', []) stopwatch = Stopwatch() diff --git a/ovos_core/intent_services/converse_service.py b/ovos_core/intent_services/converse_service.py index 37a9d99ce29..215cea57a63 100644 --- a/ovos_core/intent_services/converse_service.py +++ b/ovos_core/intent_services/converse_service.py @@ -387,11 +387,6 @@ def handle_deactivate_skill_request(self, message: Message): def reset_converse(self, message: Message): """Let skills know there was a problem with speech recognition""" lang = get_message_lang() - try: - setup_locale(lang) # restore default lang - except Exception as e: - LOG.exception(f"Failed to set lingua_franca default lang to {lang}") - self.converse_with_skills([], lang, message) def handle_get_active_skills(self, message: Message): diff --git a/ovos_core/version.py b/ovos_core/version.py index ead267da0e5..a7bc80bd8c1 100644 --- a/ovos_core/version.py +++ b/ovos_core/version.py @@ -1,8 +1,8 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 2 -VERSION_BUILD = 8 -VERSION_ALPHA = 0 +VERSION_BUILD = 10 +VERSION_ALPHA = 1 # END_VERSION_BLOCK # for compat with old imports diff --git a/requirements/extra-deprecated.txt b/requirements/extra-deprecated.txt index 2760f4b4b63..daf18d98f76 100644 --- a/requirements/extra-deprecated.txt +++ b/requirements/extra-deprecated.txt @@ -10,6 +10,7 @@ pyaudio # mycroft-core imports / default plugins # for compat with mycroft namespace +ovos-lingua-franca>=0.4.7,<1.0.0 # NOTE: ovos-listener is causing conflicts in dependency resolution, blocks ovos-bus-client 1.0.0 ovos-listener>=0.0.3,<1.0.0 ovos-tts-plugin-mimic>=0.2.8, <1.0.0 diff --git a/requirements/plugins.txt b/requirements/plugins.txt index c5e9c288726..7a84a618044 100644 --- a/requirements/plugins.txt +++ b/requirements/plugins.txt @@ -3,6 +3,7 @@ ovos-utterance-plugin-cancel>=0.2.2, <1.0.0 ovos-bidirectional-translation-plugin>=0.1.0, <1.0.0 ovos-translate-server-plugin>=0.0.2, <1.0.0 ovos-utterance-normalizer>=0.2.1, <1.0.0 - +ovos-number-parser>=0.0.1,<1.0.0 +ovos-date-parser>=0.0.3,<1.0.0 # still in alpha ovos-classifiers diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 721d70d28ac..c0b55630b93 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -12,6 +12,5 @@ ovos-utils>=0.3.5,<1.0.0 ovos_bus_client>=0.1.4,<2.0.0 ovos-plugin-manager>=0.5.6,<1.0.0 ovos-config>=0.0.13,<1.0.0 -ovos-lingua-franca>=0.4.7,<1.0.0 ovos-backend-client>=0.1.0,<2.0.0 -ovos-workshop>=2.0.1,<3.0.0 \ No newline at end of file +ovos-workshop>=2.2.2,<3.0.0