From 04e4da0d31a2097d5db44a0ddbc3d7d9078d2474 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Wed, 7 Feb 2018 13:16:11 -0500 Subject: [PATCH] Revert "Avoid duplicate dependency installation" This reverts commit c0cf41a15ccf7f9060c4dd891ff4b16814f7ecbc. --- lib/galaxy/tools/deps/__init__.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/galaxy/tools/deps/__init__.py b/lib/galaxy/tools/deps/__init__.py index 3e3a79b33e9..471274cd792 100644 --- a/lib/galaxy/tools/deps/__init__.py +++ b/lib/galaxy/tools/deps/__init__.py @@ -159,9 +159,6 @@ class DependencyManager(object): # Shortcut - resolution complete for this resolver. resolver_requirements.append(requirement_to_dependency) - # We have a complete set of dependencies, don't install - # via lower-ranked resolvers - kwds['install'] = False continue # Check individual requirements @@ -181,11 +178,6 @@ class DependencyManager(object): requirement_to_dependency[requirement] = dependency if requirement_to_dependency: resolver_requirements.append(requirement_to_dependency) - if (len(requirement_to_dependency) == len(resolvable_requirements) and - all(True for d in requirement_to_dependency if not isinstance(d, NullDependency))): - # We resolved all individual requirements, no need to further install dependencies - # resolved by subsequent resolvers. - kwds['install'] = False if not resolver_requirements: # Have at least a single empty dict resolver_requirements.append(OrderedDict())