Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated code #672

Merged
merged 1 commit into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions neon_core/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,24 +91,14 @@ def update_default_resources():


@neon_core_cli.command(help="Start Neon Skills module")
@click.option("--install-skills", "-i", default=None,
help="Path to local skills for which to install dependencies")
def run_skills(install_skills):
def run_skills():
from neon_utils.configuration_utils import init_config_dir
init_config_dir()

from neon_core.util.skill_utils import update_default_resources
update_default_resources()

# from neon_core.util.skill_utils import install_local_skills
from neon_core.skills.__main__ import main
if install_skills:
click.echo(f"Local skill installation is deprecated. "
f"Add pip specs to config.")
# try:
# install_local_skills(install_skills)
# except ValueError as e:
# click.echo(f"Skill Installation Failed: {e}")
click.echo("Starting Skills Service")
main()
click.echo("Skills Service Shutdown")
6 changes: 1 addition & 5 deletions neon_core/skills/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,10 @@
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# TODO: Deprecate `conversational_intent`
from neon_core.skills.decorators import conversational_intent

# Backwards-compat import
from ovos_workshop.decorators import intent_handler, intent_file_handler, \
resting_screen_handler

__all__ = ['intent_handler',
'intent_file_handler',
'resting_screen_handler',
'conversational_intent']
'resting_screen_handler']
132 changes: 0 additions & 132 deletions neon_core/skills/decorators.py

This file was deleted.

7 changes: 4 additions & 3 deletions neon_core/skills/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
from ovos_bus_client import Message, MessageBusClient
from ovos_config.locale import set_default_lang, set_default_tz
from ovos_config.config import Configuration
from ovos_utils.log import LOG
from ovos_utils.log import LOG, log_deprecation
from ovos_plugin_manager.skills import get_plugin_skills, get_skill_directories
from ovos_utils.process_utils import StatusCallbackMap
from neon_utils.metrics_utils import announce_connection
Expand Down Expand Up @@ -99,8 +99,9 @@ def __init__(self,

@property
def status(self):
LOG.warning("This reference is deprecated. "
"Use `NeonSkillService.skill_manager.status` directly.")
log_deprecation("This reference is deprecated. Use "
"`NeonSkillService.skill_manager.status` directly.",
"24.7.0")
return self.skill_manager.status

def _get_skill_dirs(self) -> list:
Expand Down
Loading
Loading