From fd75f90d0887c194c65bf58502e34359c44b2bb1 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Tue, 24 Oct 2023 18:06:16 -0700 Subject: [PATCH] Update init and deprecation logging to resolve test failure --- neon_core/__init__.py | 4 ++-- neon_core/config.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/neon_core/__init__.py b/neon_core/__init__.py index 466d3f54b..e25033df2 100644 --- a/neon_core/__init__.py +++ b/neon_core/__init__.py @@ -28,7 +28,7 @@ # import sys -# from neon_core.config import setup_resolve_resource_file, get_core_version +from neon_core.config import setup_resolve_resource_file, get_core_version from os.path import dirname @@ -37,7 +37,7 @@ # sys.path.append(NEON_ROOT_PATH) CORE_VERSION_STR = "" # get_core_version() -# setup_resolve_resource_file() +setup_resolve_resource_file() __all__ = ['NEON_ROOT_PATH', 'CORE_VERSION_STR'] diff --git a/neon_core/config.py b/neon_core/config.py index 09cb60d04..b675c4bb7 100644 --- a/neon_core/config.py +++ b/neon_core/config.py @@ -55,11 +55,12 @@ def setup_resolve_resource_file(): """ from ovos_utils.log import log_deprecation from neon_utils.file_utils import resolve_neon_resource_file - log_deprecation("This method is deprecated; resource resolution is handled " - "automatically.", "23.12.1") def patched_resolve_resource_file(res_name): from mycroft.util.file_utils import resolve_resource_file + log_deprecation("This method is deprecated; use " + "`ovos_utils.file_utils.resolve_resource_file.", + "23.12.1") resource = resolve_neon_resource_file(res_name) or \ resolve_resource_file(res_name) return resource