Move dependency_display to avoid Galaxy -> Tool Shed import.

lib/galaxy/tool_shed/util/dependency_display.py

@@ -2,8 +2,8 @@ import logging
 import os
 
 from galaxy import util
-from galaxy.tool_shed.util.common_util import parse_repository_dependency_tuple
 from galaxy.tool_shed.util import utility_container_manager
+from galaxy.util.tool_shed.common_util import parse_repository_dependency_tuple
 
 log = logging.getLogger(__name__)
 
@@ -63,9 +63,7 @@ class DependencyDisplayer:
                             prior_installation_required,
                             only_if_compiling_contained_td,
                             error,
-                        ) = parse_repository_dependency_tuple(
-                            repository_dependency_tup, contains_error=True
-                        )
+                        ) = parse_repository_dependency_tuple(repository_dependency_tup, contains_error=True)
                         if error:
                             message += f"{error}  "
             else:
@@ -190,9 +188,7 @@ class DependencyDisplayer:
             message += set_environment_orphans_str
         return message
 
-    def populate_containers_dict_from_repository_metadata(
-        self, repository
-    ):
+    def populate_containers_dict_from_repository_metadata(self, repository):
         """
         Retrieve necessary information from the received repository's metadata to populate the
         containers_dict for display.  This method is called only from Galaxy (not the tool shed)

lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py

@@ -25,7 +25,7 @@ from galaxy.util.tool_shed import (
     encoding_util,
 )
 from galaxy.web.form_builder import CheckboxField
-from tool_shed.galaxy_install import dependency_display
+from galaxy.tool_shed.util import dependency_display
 from tool_shed.util import shed_util_common as suc
 from tool_shed.util.repository_util import create_repo_info_dict
 from tool_shed.util.web_util import escape

lib/tool_shed/webapp/controllers/repository.py

@@ -24,6 +24,7 @@ from galaxy import (
     util,
     web,
 )
+from galaxy.tool_shed.util import dependency_display
 from galaxy.tools.repositories import ValidationContext
 from galaxy.web.form_builder import (
     CheckboxField,
@@ -32,7 +33,6 @@ from galaxy.web.form_builder import (
 from galaxy.web.legacy_framework import grids
 from galaxy.webapps.base.controller import BaseUIController
 from tool_shed.dependencies.repository import relation_builder
-from tool_shed.galaxy_install import dependency_display
 from tool_shed.metadata import repository_metadata_manager
 from tool_shed.tools import (
     tool_validator,

lib/tool_shed/webapp/controllers/upload.py

@@ -10,10 +10,10 @@ from galaxy import (
     util,
     web,
 )
+from galaxy.tool_shed.util import dependency_display
 from galaxy.util import checkers
 from galaxy.webapps.base.controller import BaseUIController
 from tool_shed.dependencies import attribute_handlers
-from tool_shed.galaxy_install import dependency_display
 from tool_shed.metadata import repository_metadata_manager
 from tool_shed.repository_types import util as rt_util
 from tool_shed.tools.data_table_manager import ShedToolDataTableManager