Skip to content

Commit 71e0982

Browse files
committed
Introduce installable_resolver property
1 parent 0f71e59 commit 71e0982

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

lib/galaxy/tools/deps/views.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,10 @@ def install_dependency(self, index=None, **payload):
5757
if index:
5858
return self._install_dependency(index, **payload)
5959
else:
60-
for index, resolver in enumerate(self._dependency_resolvers):
61-
if not hasattr(resolver, "install_dependency"):
62-
continue
63-
else:
64-
success = self._install_dependency(index, **payload)
65-
if success:
66-
return success
60+
for index in self.installable_resolvers:
61+
success = self._install_dependency(index, **payload)
62+
if success:
63+
return success
6764
return False
6865

6966
def _install_dependency(self, index, **payload):
@@ -121,6 +118,13 @@ def _dependency_resolvers(self):
121118
dependency_resolvers = dependency_manager.dependency_resolvers
122119
return dependency_resolvers
123120

121+
@property
122+
def installable_resolvers(self):
123+
"""
124+
List index for all resolvers that have the 'install_dependency' attribute
125+
"""
126+
return [index for index, resolver in enumerate(self._dependency_resolvers) if hasattr(resolver, "install_dependency")]
127+
124128
def get_requirements_status(self, requested_requirements):
125129
result = []
126130
for req in requested_requirements:

0 commit comments

Comments
 (0)