diff --git a/.github/workflows/constraint_tests.yml b/.github/workflows/constraint_tests.yml index e8aa2be5141b..37e6898761dd 100644 --- a/.github/workflows/constraint_tests.yml +++ b/.github/workflows/constraint_tests.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - constraints_file: ['stable', 'testing'] + constraints_file: ['testing'] steps: - name: Checkout repository diff --git a/ovos_core/intent_services/__init__.py b/ovos_core/intent_services/__init__.py index d816e3a40e8c..a22c518b3331 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 37a9d99ce29a..215cea57a632 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/requirements/extra-deprecated.txt b/requirements/extra-deprecated.txt index 2760f4b4b635..daf18d98f763 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 c5e9c288726a..7a84a6180440 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 f0eca3f31c8b..c0b55630b93f 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -7,10 +7,10 @@ padacioso>=1.0.0, <2.0.0 ovos-adapt-parser>=1.0.4, <2.0.0 ovos_ocp_pipeline_plugin>=1.0.5, <2.0.0 ovos-common-query-pipeline-plugin>=1.0.4, <2.0.0 + 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