From 48a22d6e53c08de37a8a39cc5bb0228789a19033 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Sun, 8 Jan 2017 21:08:08 +0100 Subject: [PATCH] Revert "Restore the cached environments for now ... better to completely eliminate them later" This reverts commit ad92bbf9bebafed22395e0199efd35a838ac1f4a. --- lib/galaxy/webapps/galaxy/api/tools.py | 2 -- lib/tool_shed/galaxy_install/install_manager.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/api/tools.py b/lib/galaxy/webapps/galaxy/api/tools.py index d9e15895a78..efa6314f5de 100644 --- a/lib/galaxy/webapps/galaxy/api/tools.py +++ b/lib/galaxy/webapps/galaxy/api/tools.py @@ -142,8 +142,6 @@ class ToolsController( BaseAPIController, UsesVisualizationMixin ): """ tool = self._get_tool(id) tool._view.install_dependencies(None, tool.requirements) - if kwds.get('build_dependency_cache'): - tool.build_dependency_cache(**kwds) # TODO: rework resolver install system to log and report what has been done. # _view.install_dependencies should return a dict with stdout, stderr and success status return tool.tool_requirements_status diff --git a/lib/tool_shed/galaxy_install/install_manager.py b/lib/tool_shed/galaxy_install/install_manager.py index 5f668105a18..d79383b7a2c 100644 --- a/lib/tool_shed/galaxy_install/install_manager.py +++ b/lib/tool_shed/galaxy_install/install_manager.py @@ -911,8 +911,6 @@ class InstallRepositoryManager( object ): if tool and tool.requirements not in installed_requirements: installed_requirements.append(tool.requirements) self._view.install_dependencies(None, tool.requirements) - if self.app.config.use_cached_dependency_manager: - tool.build_dependency_cache() if install_tool_dependencies and tool_shed_repository.tool_dependencies and 'tool_dependencies' in metadata: work_dir = tempfile.mkdtemp( prefix="tmp-toolshed-itsr" ) # Install tool dependencies.