diff --git a/lib/tool_shed/galaxy_install/dependency_display.py b/lib/tool_shed/galaxy_install/dependency_display.py index 0fe28bb3006..949b3fc168b 100644 --- a/lib/tool_shed/galaxy_install/dependency_display.py +++ b/lib/tool_shed/galaxy_install/dependency_display.py @@ -287,16 +287,6 @@ class DependencyDisplayer: ) installed_tool_dependencies = repository_installed_tool_dependencies missing_tool_dependencies = repository_missing_tool_dependencies - # Handle valid tools. - valid_tools = metadata.get("tools", None) - # Handle Data Managers - valid_data_managers = None - invalid_data_managers = None - data_managers_errors = None - if "data_manager" in metadata: - valid_data_managers = metadata["data_manager"].get("data_managers", None) - invalid_data_managers = metadata["data_manager"].get("invalid_data_managers", None) - data_managers_errors = metadata["data_manager"].get("messages", None) gucm = GalaxyUtilityContainerManager(self.app) containers_dict = gucm.build_repository_containers( repository=repository, @@ -304,10 +294,6 @@ class DependencyDisplayer: missing_tool_dependencies=missing_tool_dependencies, repository_dependencies=installed_repository_dependencies, tool_dependencies=installed_tool_dependencies, - valid_tools=valid_tools, - valid_data_managers=valid_data_managers, - invalid_data_managers=invalid_data_managers, - data_managers_errors=data_managers_errors, new_install=False, reinstalling=False, ) diff --git a/lib/tool_shed/galaxy_install/utility_containers/__init__.py b/lib/tool_shed/galaxy_install/utility_containers/__init__.py index 0e9dab9bc8b..670fec127a5 100644 --- a/lib/tool_shed/galaxy_install/utility_containers/__init__.py +++ b/lib/tool_shed/galaxy_install/utility_containers/__init__.py @@ -16,10 +16,6 @@ class GalaxyUtilityContainerManager(utility_container_manager.UtilityContainerMa missing_tool_dependencies, repository_dependencies, tool_dependencies, - valid_tools, - valid_data_managers, - invalid_data_managers, - data_managers_errors, new_install=False, reinstalling=False, ): @@ -34,10 +30,6 @@ class GalaxyUtilityContainerManager(utility_container_manager.UtilityContainerMa # Some of the tool dependency folders will include links to display tool dependency information, and # some of these links require the repository id. However we need to be careful because sometimes the # repository object is None. - if repository: - changeset_revision = repository.changeset_revision - else: - changeset_revision = None try: folder_id = 0 # Installed repository dependencies container. @@ -87,26 +79,6 @@ class GalaxyUtilityContainerManager(utility_container_manager.UtilityContainerMa reinstalling=reinstalling, ) containers_dict["missing_tool_dependencies"] = missing_tool_dependencies_root_folder - # Valid tools container. - if valid_tools: - folder_id, valid_tools_root_folder = self.build_tools_folder( - folder_id, valid_tools, repository, changeset_revision, label="Valid tools" - ) - containers_dict["valid_tools"] = valid_tools_root_folder - # Workflows container. - if valid_data_managers: - folder_id, valid_data_managers_root_folder = self.build_data_managers_folder( - folder_id=folder_id, data_managers=valid_data_managers, label="Valid Data Managers" - ) - containers_dict["valid_data_managers"] = valid_data_managers_root_folder - if invalid_data_managers or data_managers_errors: - folder_id, invalid_data_managers_root_folder = self.build_invalid_data_managers_folder( - folder_id=folder_id, - data_managers=invalid_data_managers, - error_messages=data_managers_errors, - label="Invalid Data Managers", - ) - containers_dict["invalid_data_managers"] = invalid_data_managers_root_folder except Exception as e: log.debug(f"Exception in build_repository_containers: {str(e)}") return containers_dict