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

Use more traditional Galaxy config handling for DTD.

Browse Source
This commit is contained in:
John Chilton
2016-07-20 15:46:57 -04:00
parent 99161d6074
commit ed48c6c28b
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/config.py
+1
View File
@@ -525,6 +525,7 @@ class Configuration( object ):
datatypes_config_file=[ 'config/datatypes_conf.xml', 'datatypes_conf.xml', 'config/datatypes_conf.xml.sample' ],
external_service_type_config_file=[ 'config/external_service_types_conf.xml', 'external_service_types_conf.xml', 'config/external_service_types_conf.xml.sample' ],
job_config_file=[ 'config/job_conf.xml', 'job_conf.xml' ],
tool_destinations_config_file=[ 'config/tool_destinations.yml', 'config/tool_destinations.yml.sample' ],
job_metrics_config_file=[ 'config/job_metrics_conf.xml', 'job_metrics_conf.xml', 'config/job_metrics_conf.xml.sample' ],
dependency_resolvers_config_file=[ 'config/dependency_resolvers_conf.xml', 'dependency_resolvers_conf.xml' ],
job_resource_params_file=[ 'config/job_resource_params_conf.xml', 'job_resource_params_conf.xml' ],
lib/galaxy/jobs/rules/dynamic_tool_destination.py
+4 -1
View File
@@ -1103,7 +1103,7 @@ def importer(test):
def map_tool_to_destination(
job, app, tool, user_email, test=False, path="/config/tool_destinations.yml"):
job, app, tool, user_email, test=False, path=None):
"""
Dynamically allocate resources
@@ -1128,6 +1128,9 @@ def map_tool_to_destination(
records_rule_present = False
# Get configuration from tool_destinations.yml
if path is None:
path = app.config.tool_destinations_config_file
try:
config = parse_yaml(path)
except MalformedYMLException as e: