From: Shane Jaroch Date: Fri, 19 Apr 2024 17:12:04 +0000 (-0400) Subject: rename recipe.utils to recipe.recipe X-Git-Tag: v0.2.8.dev2~22 X-Git-Url: https://git.nutra.tk/v2?a=commitdiff_plain;h=f015ba541b30d47046735b00005a862a5d80952a;p=nutratech%2Fcli.git rename recipe.utils to recipe.recipe --- diff --git a/ntclient/argparser/funcs.py b/ntclient/argparser/funcs.py index c6e7df4..b9f27a0 100644 --- a/ntclient/argparser/funcs.py +++ b/ntclient/argparser/funcs.py @@ -15,7 +15,7 @@ from tabulate import tabulate import ntclient.services.analyze import ntclient.services.bugs -import ntclient.services.recipe.utils +import ntclient.services.recipe.recipe import ntclient.services.usda from ntclient.services import calculate as calc from ntclient.utils import CLI_CONFIG, Gender, activity_factor_from_index @@ -81,12 +81,12 @@ def recipes_init(args: argparse.Namespace) -> tuple: """Copy example/stock data into RECIPE_HOME""" _force = args.force - return ntclient.services.recipe.utils.recipes_init(_force=_force) + return ntclient.services.recipe.recipe.recipes_init(_force=_force) def recipes() -> tuple: """Show all, in tree or detail view""" - return ntclient.services.recipe.utils.recipes_overview() + return ntclient.services.recipe.recipe.recipes_overview() def recipe(args: argparse.Namespace) -> tuple: @@ -97,7 +97,7 @@ def recipe(args: argparse.Namespace) -> tuple: """ recipe_path = args.path - return ntclient.services.recipe.utils.recipe_overview(recipe_path=recipe_path) + return ntclient.services.recipe.recipe.recipe_overview(recipe_path=recipe_path) ############################################################################## diff --git a/ntclient/services/recipe/utils.py b/ntclient/services/recipe/recipe.py similarity index 100% rename from ntclient/services/recipe/utils.py rename to ntclient/services/recipe/recipe.py diff --git a/tests/services/test_recipe.py b/tests/services/test_recipe.py index a1bf7fe..b3fe919 100644 --- a/tests/services/test_recipe.py +++ b/tests/services/test_recipe.py @@ -10,7 +10,7 @@ from unittest.mock import patch import pytest -import ntclient.services.recipe.utils as r +import ntclient.services.recipe.recipe as r from ntclient.models import Recipe from ntclient.services.recipe import RECIPE_STOCK, csv_utils