Merge pull request #5369 from oliver-sanders/clean-clean

workflow_files: split overgrown module
cylc · Feb 24, 2023 · 3768d34 · 3768d34
2 parents 0d7d9a6 + f539f59
commit 3768d34
Show file tree

Hide file tree

Showing 13 changed files with 2,830 additions and 2,603 deletions.
diff --git a/cylc/flow/clean.py b/cylc/flow/clean.py
diff --git a/cylc/flow/install.py b/cylc/flow/install.py
diff --git a/cylc/flow/network/__init__.py b/cylc/flow/network/__init__.py
@@ -22,6 +22,7 @@
 
 import zmq
 import zmq.asyncio
+import zmq.auth
 
 from cylc.flow import LOG
 from cylc.flow.exceptions import (

diff --git a/cylc/flow/scripts/clean.py b/cylc/flow/scripts/clean.py
@@ -64,6 +64,7 @@
 from typing import TYPE_CHECKING, Iterable, List, Tuple
 
 from cylc.flow import LOG
+from cylc.flow.clean import init_clean, get_contained_workflows
 from cylc.flow.exceptions import CylcError, InputError
 import cylc.flow.flags
 from cylc.flow.id_cli import parse_ids_async
@@ -74,7 +75,6 @@
     Options,
 )
 from cylc.flow.terminal import cli_function, is_terminal
-from cylc.flow.workflow_files import init_clean, get_contained_workflows
 
 if TYPE_CHECKING:
     from optparse import Values

diff --git a/cylc/flow/scripts/install.py b/cylc/flow/scripts/install.py
@@ -105,7 +105,7 @@
     expand_path,
     get_workflow_run_dir
 )
-from cylc.flow.workflow_files import (
+from cylc.flow.install import (
     install_workflow,
     parse_cli_sym_dirs,
     search_install_source_dirs

diff --git a/cylc/flow/scripts/reinstall.py b/cylc/flow/scripts/reinstall.py
@@ -80,6 +80,9 @@
     ServiceFileError,
     WorkflowFilesError,
 )
+from cylc.flow.install import (
+    reinstall_workflow,
+)
 from cylc.flow.id_cli import parse_id
 from cylc.flow.option_parsers import (
     CylcOptionParser as COP,
@@ -91,7 +94,6 @@
 from cylc.flow.workflow_files import (
     get_workflow_source_dir,
     load_contact_file,
-    reinstall_workflow,
 )
 from cylc.flow.terminal import cli_function, DIM, is_terminal