From 11e96df42e9856f8a5e3a02e6c6b284b71b43d7d Mon Sep 17 00:00:00 2001 From: Kabir Vats Date: Thu, 12 Sep 2024 14:08:15 -0600 Subject: [PATCH] add more to common.util --- beeflow/common/config_driver.py | 2 +- beeflow/common/{ => util}/validation.py | 0 beeflow/common/{ => util}/wf_profiler.py | 0 beeflow/common/worker/slurm_worker.py | 2 +- beeflow/wf_manager/resources/wf_list.py | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename beeflow/common/{ => util}/validation.py (100%) rename beeflow/common/{ => util}/wf_profiler.py (100%) diff --git a/beeflow/common/config_driver.py b/beeflow/common/config_driver.py index 9eb0ffe2d..fdbce9bd8 100644 --- a/beeflow/common/config_driver.py +++ b/beeflow/common/config_driver.py @@ -12,7 +12,7 @@ from beeflow.common.config_validator import ConfigValidator from beeflow.common.util.cli import NaturalOrderGroup -from beeflow.common import validation +from beeflow.common.util import validation from beeflow.common.util.tab_completion import filepath_completion diff --git a/beeflow/common/validation.py b/beeflow/common/util/validation.py similarity index 100% rename from beeflow/common/validation.py rename to beeflow/common/util/validation.py diff --git a/beeflow/common/wf_profiler.py b/beeflow/common/util/wf_profiler.py similarity index 100% rename from beeflow/common/wf_profiler.py rename to beeflow/common/util/wf_profiler.py diff --git a/beeflow/common/worker/slurm_worker.py b/beeflow/common/worker/slurm_worker.py index 411298106..74765fa85 100644 --- a/beeflow/common/worker/slurm_worker.py +++ b/beeflow/common/worker/slurm_worker.py @@ -13,7 +13,7 @@ from beeflow.common.util import log as bee_logging from beeflow.common.worker.worker import (Worker, WorkerError) -from beeflow.common import validation +from beeflow.common.util import validation from beeflow.common.worker.utils import get_state_sacct from beeflow.common.worker.utils import parse_key_val diff --git a/beeflow/wf_manager/resources/wf_list.py b/beeflow/wf_manager/resources/wf_list.py index 0f916d82b..b65f12a90 100644 --- a/beeflow/wf_manager/resources/wf_list.py +++ b/beeflow/wf_manager/resources/wf_list.py @@ -13,7 +13,7 @@ from celery import shared_task # noqa (pylama can't find celery imports) from beeflow.common.util import log as bee_logging -# from beeflow.common.wf_profiler import WorkflowProfiler +# from beeflow.common.util.wf_profiler import WorkflowProfiler from beeflow.wf_manager.resources import wf_utils from beeflow.common import wf_data