Skip to content

Commit

Permalink
deprecate bus utils (#207)
Browse files Browse the repository at this point in the history
* deprecate bus utils

* deprecate bus utils
  • Loading branch information
JarbasAl authored Dec 28, 2023
1 parent 92f80e1 commit a6432fb
Show file tree
Hide file tree
Showing 17 changed files with 214 additions and 209 deletions.
4 changes: 2 additions & 2 deletions ovos_utils/enclosure/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
5 changes: 3 additions & 2 deletions ovos_utils/enclosure/api.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 2 additions & 3 deletions ovos_utils/enclosure/mark1/__init__.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
6 changes: 3 additions & 3 deletions ovos_utils/enclosure/mark1/eyes/__init__.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand Down
5 changes: 2 additions & 3 deletions ovos_utils/enclosure/mark1/faceplate/__init__.py
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
6 changes: 3 additions & 3 deletions ovos_utils/enclosure/mark1/faceplate/animations.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand Down
6 changes: 3 additions & 3 deletions ovos_utils/enclosure/mark1/faceplate/cellular_automaton.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand Down
6 changes: 3 additions & 3 deletions ovos_utils/enclosure/mark1/faceplate/icons.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand Down
4 changes: 2 additions & 2 deletions ovos_utils/intents/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down
4 changes: 2 additions & 2 deletions ovos_utils/intents/converse.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions ovos_utils/intents/intent_service_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down
4 changes: 2 additions & 2 deletions ovos_utils/intents/layers.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading

0 comments on commit a6432fb

Please sign in to comment.