|
16 | 16 | from .utils import HasReqsHints |
17 | 17 |
|
18 | 18 | if TYPE_CHECKING: |
| 19 | + from galaxy.tool_util.deps.requirements import ToolRequirements |
| 20 | + |
19 | 21 | from .builder import Builder |
20 | 22 |
|
21 | 23 | try: |
22 | | - from galaxy.tool_util import deps |
23 | | - from galaxy.tool_util.deps.requirements import ToolRequirement, ToolRequirements |
| 24 | + import galaxy.tool_util as galaxy_tool_util |
24 | 25 | except ImportError: |
25 | | - ToolRequirement = None # type: ignore |
26 | | - ToolRequirements = None # type: ignore |
27 | | - deps = None # type: ignore |
| 26 | + galaxy_tool_util = None # type: ignore |
28 | 27 |
|
29 | 28 |
|
30 | | -SOFTWARE_REQUIREMENTS_ENABLED = deps is not None |
| 29 | +SOFTWARE_REQUIREMENTS_ENABLED = galaxy_tool_util is not None |
31 | 30 |
|
32 | 31 | COMMAND_WITH_DEPENDENCIES_TEMPLATE = string.Template( |
33 | 32 | """#!/bin/bash |
@@ -74,6 +73,8 @@ def __init__(self, args: argparse.Namespace) -> None: |
74 | 73 |
|
75 | 74 | def build_job_script(self, builder: "Builder", command: list[str]) -> str: |
76 | 75 | """Use the galaxy-tool-util library to construct a build script.""" |
| 76 | + from galaxy.tool_util import deps |
| 77 | + |
77 | 78 | ensure_galaxy_lib_available() |
78 | 79 | resolution_config_dict = { |
79 | 80 | "use": self.use_tool_dependencies, |
@@ -102,8 +103,12 @@ def build_job_script(self, builder: "Builder", command: list[str]) -> str: |
102 | 103 | return job_script |
103 | 104 |
|
104 | 105 |
|
105 | | -def get_dependencies(builder: HasReqsHints) -> ToolRequirements: |
| 106 | +def get_dependencies( |
| 107 | + builder: HasReqsHints, |
| 108 | +) -> "ToolRequirements": |
106 | 109 | (software_requirement, _) = builder.get_requirement("SoftwareRequirement") |
| 110 | + from galaxy.tool_util.deps.requirements import ToolRequirement, ToolRequirements |
| 111 | + |
107 | 112 | dependencies: list[Union["ToolRequirement", dict[str, Any]]] = [] |
108 | 113 | if software_requirement and software_requirement.get("packages"): |
109 | 114 | packages = cast( |
|
0 commit comments