deprecate bus utils (OpenVoiceOS#207)

* deprecate bus utils * deprecate bus utils
emphasize · Dec 30, 2023 · 310e104 · 310e104
1 parent ba4ade5
commit 310e104
Show file tree

Hide file tree

Showing 17 changed files with 214 additions and 209 deletions.
diff --git a/ovos_utils/enclosure/__init__.py b/ovos_utils/enclosure/__init__.py
@@ -3,9 +3,9 @@
 from enum import Enum
 from os.path import exists
 from typing import Optional
-from ovos_utils.log import LOG, deprecated
+from ovos_utils.log import deprecated, log_deprecation
 
-LOG.warning("ovos_utils.enclosure has been deprecated! this module will be removed in version 0.1.0")
+log_deprecation("ovos_utils.enclosure has been deprecated!", "0.1.0")
 
 
 class MycroftEnclosures(str, Enum):

diff --git a/ovos_utils/enclosure/api.py b/ovos_utils/enclosure/api.py
@@ -1,6 +1,7 @@
-from ovos_utils.log import LOG
+from ovos_utils.log import log_deprecation
+
+log_deprecation("EnclosureApi has moved to ovos_bus_client.apis.enclosure", "0.1.0")
 
-LOG.warning("EnclosureApi has moved to ovos_bus_client.apis.enclosure")
 
 try:
     from ovos_bus_client.apis.enclosure import EnclosureApi

diff --git a/ovos_utils/enclosure/mark1/__init__.py b/ovos_utils/enclosure/mark1/__init__.py
@@ -1,8 +1,7 @@
 from ovos_utils.enclosure.api import EnclosureAPI
-from ovos_utils.log import LOG
+from ovos_utils.log import log_deprecation
 
-LOG.warning("ovos_utils.enclosure.mark1 moved to https://github.com/OpenVoiceOS/ovos-mark1-utils ;"
-            " this module will be removed in version 0.1.0")
+log_deprecation("ovos_utils.enclosure.mark1 moved to https://github.com/OpenVoiceOS/ovos-mark1-utils", "0.1.0")
 
 
 class Mark1EnclosureAPI(EnclosureAPI):

diff --git a/ovos_utils/enclosure/mark1/eyes/__init__.py b/ovos_utils/enclosure/mark1/eyes/__init__.py
@@ -1,7 +1,7 @@
-from ovos_utils.log import LOG
+from ovos_utils.log import log_deprecation
+
+log_deprecation("ovos_utils.enclosure.mark1.eyes moved to https://github.com/OpenVoiceOS/ovos-mark1-utils", "0.1.0")
 
-LOG.warning("ovos_utils.enclosure.mark1.faceplate moved to https://github.com/OpenVoiceOS/ovos-mark1-utils ;"
-            " this module will be removed in version 0.1.0")
 
 try:
     from ovos_mark1.eyes import *

diff --git a/ovos_utils/enclosure/mark1/faceplate/__init__.py b/ovos_utils/enclosure/mark1/faceplate/__init__.py
@@ -1,14 +1,13 @@
 from ovos_utils.enclosure.mark1 import Mark1EnclosureAPI
 from ovos_utils import create_loop
-from ovos_utils.log import LOG
+from ovos_utils.log import LOG, log_deprecation
 from ovos_utils.messagebus import get_mycroft_bus
 import random
 from time import sleep
 from collections.abc import MutableSequence
 import copy
 
-LOG.warning("ovos_utils.enclosure.mark1.faceplate moved to https://github.com/OpenVoiceOS/ovos-mark1-utils ;"
-            " this module will be removed in version 0.1.0")
+log_deprecation("ovos_utils.enclosure.mark1.faceplate moved to https://github.com/OpenVoiceOS/ovos-mark1-utils", "0.1.0")
 
 
 try:

diff --git a/ovos_utils/enclosure/mark1/faceplate/animations.py b/ovos_utils/enclosure/mark1/faceplate/animations.py
@@ -1,10 +1,10 @@
 import copy
 import random
 
-from ovos_utils.log import LOG
+from ovos_utils.log import log_deprecation
+
+log_deprecation("ovos_utils.enclosure.mark1.faceplate moved to https://github.com/OpenVoiceOS/ovos-mark1-utils", "0.1.0")
 
-LOG.warning("ovos_utils.enclosure.mark1.faceplate moved to https://github.com/OpenVoiceOS/ovos-mark1-utils ;"
-            " this module will be removed in version 0.1.0")
 
 try:
     from ovos_mark1.faceplate.animations import *

diff --git a/ovos_utils/enclosure/mark1/faceplate/cellular_automaton.py b/ovos_utils/enclosure/mark1/faceplate/cellular_automaton.py
@@ -1,10 +1,10 @@
 import copy
 import random
 
-from ovos_utils.log import LOG
+from ovos_utils.log import log_deprecation
+
+log_deprecation("ovos_utils.enclosure.mark1.faceplate moved to https://github.com/OpenVoiceOS/ovos-mark1-utils", "0.1.0")
 
-LOG.warning("ovos_utils.enclosure.mark1.faceplate moved to https://github.com/OpenVoiceOS/ovos-mark1-utils ;"
-            " this module will be removed in version 0.1.0")
 
 try:
     from ovos_mark1.faceplate.cellular_automaton import *

diff --git a/ovos_utils/enclosure/mark1/faceplate/icons.py b/ovos_utils/enclosure/mark1/faceplate/icons.py
@@ -1,7 +1,7 @@
-from ovos_utils.log import LOG
+from ovos_utils.log import log_deprecation
+
+log_deprecation("ovos_utils.enclosure.mark1.faceplate moved to https://github.com/OpenVoiceOS/ovos-mark1-utils", "0.1.0")
 
-LOG.warning("ovos_utils.enclosure.mark1.faceplate moved to https://github.com/OpenVoiceOS/ovos-mark1-utils ;"
-            " this module will be removed in version 0.1.0")
 
 try:
     from ovos_mark1.faceplate.icons import *

diff --git a/ovos_utils/intents/__init__.py b/ovos_utils/intents/__init__.py
@@ -2,9 +2,9 @@
     IntentServiceInterface
 from ovos_utils.intents.converse import ConverseTracker
 from ovos_utils.intents.layers import IntentLayers
-from ovos_utils.log import LOG
+from ovos_utils.log import log_deprecation
 
-LOG.warning("ovos_utils.intents moved to ovos_workshop.intents")
+log_deprecation("ovos_utils.intents moved to ovos_workshop.intents", "0.1.0")
 
 try:
     from ovos_workshop.intents import *

diff --git a/ovos_utils/intents/converse.py b/ovos_utils/intents/converse.py
@@ -2,9 +2,9 @@
 
 import ovos_utils.messagebus
 from ovos_utils.intents.intent_service_interface import IntentQueryApi
-from ovos_utils.log import LOG
+from ovos_utils.log import LOG, log_deprecation
 
-LOG.warning("ConverseTracker has been deprecated without replacement, it will be removed in 0.1.0")
+log_deprecation("ConverseTracker has been deprecated without replacement", "0.1.0")
 
 
 class ConverseTracker:

diff --git a/ovos_utils/intents/intent_service_interface.py b/ovos_utils/intents/intent_service_interface.py
@@ -5,8 +5,7 @@
 import ovos_utils.messagebus
 from ovos_utils.log import LOG, log_deprecation
 
-LOG.warning("ovos_utils.intents moved to ovos_workshop.intents")
-
+log_deprecation("ovos_utils.intents moved to ovos_workshop.intents", "0.1.0")
 
 try:
     from ovos_workshop.intents import *

diff --git a/ovos_utils/intents/layers.py b/ovos_utils/intents/layers.py
@@ -1,6 +1,6 @@
-from ovos_utils.log import LOG
+from ovos_utils.log import LOG, log_deprecation
 
-LOG.warning("IntentLayers moved to ovos_workshop.decorators.layers")
+log_deprecation("IntentLayers moved to ovos_workshop.decorators.layers", "0.1.0")
 
 try:
     from ovos_workshop.decorators.layers import IntentLayers