From 81b5f4a87f0e8c8ec97da5fe7b15ef817715a647 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Wed, 11 Sep 2024 00:13:45 +0100 Subject: [PATCH 1/3] chore:semver_versioning (#149) * chore:semver_versioning * unittests --- ovos_config/config.py | 13 ++++++++----- requirements/extras.txt | 2 +- requirements/requirements.txt | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ovos_config/config.py b/ovos_config/config.py index a6f3630..0c559b8 100644 --- a/ovos_config/config.py +++ b/ovos_config/config.py @@ -247,8 +247,6 @@ def set_config_update_handlers(bus): Setup websocket handlers to update config on emitted changes. @param bus: Message bus client instance """ - from ovos_utils.network_utils import is_connected - # remove any old event listeners Configuration.deregister_bus() @@ -264,9 +262,14 @@ def set_config_update_handlers(bus): Configuration.set_config_watcher() - # do the initial remote fetch - if is_connected(): - Configuration.remote.reload() + try: + # TODO - investigate why this import fails sometimes + from ovos_utils.network_utils import is_connected + if is_connected(): + # do the initial remote fetch + Configuration.remote.reload() + except: + pass @staticmethod def set_config_watcher(callback: Optional[callable] = None): diff --git a/requirements/extras.txt b/requirements/extras.txt index 009ac69..b3d6ea2 100644 --- a/requirements/extras.txt +++ b/requirements/extras.txt @@ -1 +1 @@ -ovos_backend_client < 0.2.0 +ovos-backend-client>=0.1.0,<1.0.0 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 165f9fe..d616d22 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,5 +1,5 @@ PyYAML>=5.4.0,<7.0.0 combo_lock~=0.2 python-dateutil~=2.9 -ovos-utils >= 0.0.37 +ovos-utils>=0.0.37,<1.0.0 rich-click ~=1.6 From 013e30d971df3777a8ac9663e41502a165f68818 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 10 Sep 2024 23:13:56 +0000 Subject: [PATCH 2/3] Increment Version to 0.1.1a1 --- ovos_config/version.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ovos_config/version.py b/ovos_config/version.py index cbb1e3f..e0c04e7 100644 --- a/ovos_config/version.py +++ b/ovos_config/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 1 -VERSION_BUILD = 0 -VERSION_ALPHA = 0 -# END_VERSION_BLOCK +VERSION_BUILD = 1 +VERSION_ALPHA = 1 +# END_VERSION_BLOCK \ No newline at end of file From 3f0296aec943da6d53203ef2f168148ce898f3b8 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 10 Sep 2024 23:14:28 +0000 Subject: [PATCH 3/3] Update Changelog --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 738abff..e5fedd2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # Changelog -## [0.1.0a1](https://github.com/OpenVoiceOS/ovos-config/tree/0.1.0a1) (2024-09-10) +## [0.1.1a1](https://github.com/OpenVoiceOS/ovos-config/tree/0.1.1a1) (2024-09-10) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/V0.1.0...0.1.0a1) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-config/compare/0.1.0...0.1.1a1) **Merged pull requests:** -- chore:semver\_automations [\#147](https://github.com/OpenVoiceOS/ovos-config/pull/147) ([JarbasAl](https://github.com/JarbasAl)) +- chore:semver\_versioning [\#149](https://github.com/OpenVoiceOS/ovos-config/pull/149) ([JarbasAl](https://github.com/JarbasAl))