From d71981d451568c2c97095103287601552e9a69d3 Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Fri, 14 Jan 2022 11:53:46 +0100 Subject: [PATCH] enable macros for workflow scheduler config https://github.com/galaxyproject/galaxy/issues/10179 --- lib/galaxy/workflow/scheduling_manager.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/galaxy/workflow/scheduling_manager.py b/lib/galaxy/workflow/scheduling_manager.py index bdd4691a96a..7e5ff9af1fc 100644 --- a/lib/galaxy/workflow/scheduling_manager.py +++ b/lib/galaxy/workflow/scheduling_manager.py @@ -5,12 +5,10 @@ import galaxy.workflow.schedulers from galaxy import model from galaxy.exceptions import HandlerAssignmentError from galaxy.jobs.handler import ItemGrabber -from galaxy.util import ( - parse_xml, - plugin_config, -) +from galaxy.util import plugin_config from galaxy.util.custom_logging import get_logger from galaxy.util.monitors import Monitors +from galaxy.util.xml_macros import load from galaxy.web_stack.handlers import ConfiguresHandlers, HANDLER_ASSIGNMENT_METHODS from galaxy.web_stack.message import WorkflowSchedulingMessage @@ -188,7 +186,7 @@ class WorkflowSchedulingManager(ConfiguresHandlers): self.__init_default_scheduler() else: self.DEFAULT_BASE_HANDLER_POOLS = ('workflow-schedulers',) - plugins_element = parse_xml(config_file).getroot() + plugins_element = load(config_file).getroot() self.__init_schedulers_for_element(plugins_element) if not self.__handlers_configured and self.__stack_has_pool: