From 52276a36d4d623a86ebbcd5fb4d2283b45d5648f Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Wed, 13 Jul 2022 17:21:45 -0700 Subject: [PATCH] Add config reference for backwards-compat (#171) * Add config reference for backwards-compat * Fix config patching * Update config patching in test_xdg.py * Bump ovos-config dependency Co-authored-by: Daniel McKnight --- mycroft/configuration/config.py | 1 + requirements/requirements.txt | 2 +- test/unittests/configuration/test_configuration.py | 6 +++--- test/unittests/util/test_xdg.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mycroft/configuration/config.py b/mycroft/configuration/config.py index 180e4219cfb3..f623608aeafe 100644 --- a/mycroft/configuration/config.py +++ b/mycroft/configuration/config.py @@ -1,2 +1,3 @@ # backwards compat - moved to own python package from ovos_config.config import * +from ovos_config.locations import DEFAULT_CONFIG diff --git a/requirements/requirements.txt b/requirements/requirements.txt index e7a15811f3ae..2df7134807a7 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -8,7 +8,7 @@ combo-lock~=0.2 PyYAML~=5.4 watchdog -ovos-config~=0.0.1 +ovos-config~=0.0.1, >=0.0.4a3 ovos-utils~=0.0, >=0.0.22 ovos-plugin-manager~=0.0, >=0.0.18a8 ovos-stt-plugin-server~=0.0, >=0.0.2 diff --git a/test/unittests/configuration/test_configuration.py b/test/unittests/configuration/test_configuration.py index 64703f0af2ac..1ea0e7bd35a9 100644 --- a/test/unittests/configuration/test_configuration.py +++ b/test/unittests/configuration/test_configuration.py @@ -31,9 +31,9 @@ def test_remote(self, mock_api): self.assertEqual(rc['location']['city']['name'], 'Stockholm') @patch('json.dump') - @patch('ovos_config.config.exists') - @patch('ovos_config.config.isfile') - @patch('ovos_config.config.load_commented_json') + @patch('ovos_config.models.exists') + @patch('ovos_config.models.isfile') + @patch('ovos_config.models.load_commented_json') def test_local(self, mock_json_loader, mock_isfile, mock_exists, mock_json_dump): local_conf = {'answer': 42, 'falling_objects': ['flower pot', 'whale']} diff --git a/test/unittests/util/test_xdg.py b/test/unittests/util/test_xdg.py index e9497a4f4997..cba9e8da9e8d 100644 --- a/test/unittests/util/test_xdg.py +++ b/test/unittests/util/test_xdg.py @@ -8,7 +8,7 @@ class TestXdg(TestCase): - @mock.patch('ovos_utils.configuration.get_xdg_base') + @mock.patch('ovos_config.meta.get_xdg_base') def test_base_folder(self, mock_folder): mock_folder.return_value = "testcroft" self.assertTrue(get_xdg_config_save_path().endswith("/testcroft"))