From 28a7fe7f26b67929e8f2f89c5d30dc6039d3658d Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Thu, 21 Nov 2024 19:33:50 +0000 Subject: [PATCH 1/3] fix: this time fix compat for realz (#310) --- ovos_utils/fakebus.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/ovos_utils/fakebus.py b/ovos_utils/fakebus.py index d777949..6f696e0 100644 --- a/ovos_utils/fakebus.py +++ b/ovos_utils/fakebus.py @@ -2,9 +2,8 @@ from copy import deepcopy from threading import Event -from pyee import EventEmitter - from ovos_utils.log import LOG, log_deprecation +from pyee import EventEmitter def dig_for_message(): @@ -188,7 +187,6 @@ def __new__(cls, *args, **kwargs): pass return super().__new__(cls) - def __init__(self, msg_type, data=None, context=None): """Used to construct a message object @@ -332,8 +330,9 @@ def publish(self, msg_type, data, context=None): class Message(FakeMessage): - """just for compat, stuff in the wild importing from here even with deprecation warnings...""" - def __new__(cls, *args, **kwargs): - log_deprecation("please import from ovos-bus-client directly! this import has been deprecated since version 0.1.0", "1.0.0") - return super().__new__(cls) - + """just for compat, stuff in the wild importing from here even with deprecation warnings...""" + + def __new__(cls, *args, **kwargs): + log_deprecation( + "please import from ovos-bus-client directly! this import has been deprecated since version 0.1.0", "1.0.0") + return FakeMessage(*args, **kwargs) From 52294de3a7f68a78757bd353c52be123d9405e02 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Thu, 21 Nov 2024 19:34:03 +0000 Subject: [PATCH 2/3] Increment Version to 0.5.4a1 --- ovos_utils/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ovos_utils/version.py b/ovos_utils/version.py index ca7db30..1c11e5e 100644 --- a/ovos_utils/version.py +++ b/ovos_utils/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 5 -VERSION_BUILD = 3 -VERSION_ALPHA = 0 +VERSION_BUILD = 4 +VERSION_ALPHA = 1 # END_VERSION_BLOCK From 233d11955f71a0c50fa74c672a54d8c41ab5ba91 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Thu, 21 Nov 2024 19:34:27 +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 681830c..1a4fa80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # Changelog -## [0.5.3a1](https://github.com/OpenVoiceOS/ovos-utils/tree/0.5.3a1) (2024-11-21) +## [0.5.4a1](https://github.com/OpenVoiceOS/ovos-utils/tree/0.5.4a1) (2024-11-21) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-utils/compare/0.5.2...0.5.3a1) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-utils/compare/0.5.3...0.5.4a1) **Merged pull requests:** -- fix: restore compat again [\#308](https://github.com/OpenVoiceOS/ovos-utils/pull/308) ([JarbasAl](https://github.com/JarbasAl)) +- fix: this time fix compat for realz [\#310](https://github.com/OpenVoiceOS/ovos-utils/pull/310) ([JarbasAl](https://github.com/JarbasAl))