Update import path

lib/galaxy/tool_util/deps/containers.py

@@ -25,7 +25,6 @@ from .container_classes import (
     DOCKER_CONTAINER_TYPE,
     SINGULARITY_CONTAINER_TYPE,
 )
-from . import container_resolvers
 from .container_resolvers import ResolutionCache
 from .container_resolvers.explicit import (
     ExplicitContainerResolver,

lib/galaxy/tool_util/dynamic_tool_models.py

@@ -8,7 +8,7 @@ from pydantic import BaseModel
 from typing_extensions import Literal
 
 from galaxy.schema.fields import EncodedDatabaseIdField
-from galaxy.tool_util.models import (
+from galaxy.tool_util_models import (
     DynamicToolSources,
     UserToolSource,
 )

lib/galaxy/tool_util_models/__init__.py

@@ -29,10 +29,10 @@ from typing_extensions import (
 )
 
 from galaxy.tool_util_models.parameters import GalaxyToolParameterModel
-
 from .assertions import assertions
 from .parameters import ToolParameterT
 from .tool_outputs import (
+    IncomingToolOutput,
     ToolOutput,
 )
 from .tool_source import (
@@ -44,10 +44,6 @@ from .tool_source import (
     ResourceRequirement,
     XrefDict,
 )
-from .tool_outputs import (
-    IncomingToolOutput,
-    ToolOutput,
-)
 
 
 def normalize_dict(values, keys: List[str]):

lib/galaxy/webapps/galaxy/api/tools.py

@@ -37,8 +37,8 @@ from galaxy.schema.fetch_data import (
     FetchDataFormPayload,
     FetchDataPayload,
 )
-from galaxy.tool_util.models import UserToolSource
 from galaxy.tool_util.verify import ToolTestDescriptionDict
+from galaxy.tool_util_models import UserToolSource
 from galaxy.tools.evaluation import global_tool_errors
 from galaxy.util.hash_util import (
     HashFunctionNameEnum,

lib/galaxy_test/api/test_unprivileged_tools.py

@@ -1,5 +1,5 @@
 # Test tools API.
-from galaxy.tool_util.models import UserToolSource
+from galaxy.tool_util_models import UserToolSource
 from galaxy_test.base.populators import (
     DatasetCollectionPopulator,
     DatasetPopulator,