diff --git a/joj3_config_generator/convert.py b/joj3_config_generator/convert.py index 6ac270c..9673a77 100644 --- a/joj3_config_generator/convert.py +++ b/joj3_config_generator/convert.py @@ -1,7 +1,16 @@ from typing import List -from joj3_config_generator.lib.repo import getHealthcheckConfig -from joj3_config_generator.lib.task import ( +from joj3_config_generator.processers.repo import getHealthcheckConfig, getTeapotConfig +from joj3_config_generator.processers.task import ( + fix_comment, + fix_diff, + fix_keyword, + fix_result_detail, + get_conf_stage, + get_executorWithConfig, +) +from joj3_config_generator.models import joj1, repo, result, task +from joj3_config_generator.processers.task import ( fix_diff, fix_dummy, fix_keyword, diff --git a/joj3_config_generator/main.py b/joj3_config_generator/main.py index 09018d0..7dcf687 100644 --- a/joj3_config_generator/main.py +++ b/joj3_config_generator/main.py @@ -9,7 +9,7 @@ import yaml from joj3_config_generator.convert import convert as convert_conf from joj3_config_generator.convert import convert_joj1 as convert_joj1_conf -from joj3_config_generator.lib.task import remove_nulls +from joj3_config_generator.processers.task import remove_nulls from joj3_config_generator.models import joj1, repo, result, task from joj3_config_generator.utils.logger import logger diff --git a/joj3_config_generator/lib/__init__.py b/joj3_config_generator/processers/__init__.py similarity index 100% rename from joj3_config_generator/lib/__init__.py rename to joj3_config_generator/processers/__init__.py diff --git a/joj3_config_generator/lib/repo.py b/joj3_config_generator/processers/repo.py similarity index 100% rename from joj3_config_generator/lib/repo.py rename to joj3_config_generator/processers/repo.py diff --git a/joj3_config_generator/lib/task.py b/joj3_config_generator/processers/task.py similarity index 99% rename from joj3_config_generator/lib/task.py rename to joj3_config_generator/processers/task.py index c1ccdfc..3ec6d02 100644 --- a/joj3_config_generator/lib/task.py +++ b/joj3_config_generator/processers/task.py @@ -1,8 +1,6 @@ import shlex from typing import Tuple -import rtoml - from joj3_config_generator.models import joj1, repo, result, task