opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix `involucro_auto_init` default value

Browse Source
This commit is contained in:
Nicola Soranzo
2018-11-22 12:50:23 +00:00
parent 59afe04523
commit 5255a0bf20
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/deps/container_resolvers/__init__.py
+3 -6
View File
@@ -23,15 +23,12 @@ class ContainerResolver(Dictifiable):
self.app_info = app_info
self.resolver_kwds = kwds
def _get_config_option(self, key, default=None, config_prefix=None, **kwds):
def _get_config_option(self, key, default=None):
"""Look in resolver-specific settings for option and then fallback to
global settings.
"""
global_key = "%s_%s" % (config_prefix, key)
if key in kwds:
return kwds.get(key)
elif self.app_info and hasattr(self.app_info, global_key):
return getattr(self.app_info, global_key)
if self.app_info and hasattr(self.app_info, key):
return getattr(self.app_info, key)
else:
return default
lib/galaxy/tools/deps/container_resolvers/mulled.py
+4 -4
View File
@@ -351,11 +351,11 @@ class BuildMulledDockerContainerResolver(ContainerResolver):
self.hash_func = hash_func
self._mulled_kwds = {
'namespace': namespace,
'channels': self._get_config_option("channels", DEFAULT_CHANNELS, prefix="mulled"),
'channels': self._get_config_option("mulled_channels", DEFAULT_CHANNELS),
'hash_func': self.hash_func,
'command': 'build-and-test',
}
self.auto_init = self._get_config_option("auto_init", DEFAULT_CHANNELS, prefix="involucro")
self.auto_init = self._get_config_option("involucro_auto_init", True)
def resolve(self, enabled_container_types, tool_info):
if tool_info.requires_galaxy_python_environment:
@@ -396,13 +396,13 @@ class BuildMulledSingularityContainerResolver(ContainerResolver):
self.cache_directory = kwds.get("cache_directory", os.path.join(app_info.container_image_cache_path, "singularity", "mulled"))
self.hash_func = hash_func
self._mulled_kwds = {
'channels': self._get_config_option("channels", DEFAULT_CHANNELS, prefix="mulled"),
'channels': self._get_config_option("mulled_channels", DEFAULT_CHANNELS),
'hash_func': self.hash_func,
'command': 'build-and-test',
'singularity': True,
'singularity_image_dir': self.cache_directory,
}
self.auto_init = self._get_config_option("auto_init", DEFAULT_CHANNELS, prefix="involucro")
self.auto_init = self._get_config_option("involucro_auto_init", True)
def resolve(self, enabled_container_types, tool_info):
if tool_info.requires_galaxy_python_environment: