Skip to content

Commit 2650e1e

Browse files
committed
Remove more references to Job.params (tools, managers)
1 parent 0a026ad commit 2650e1e

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

lib/galaxy/jobs/manager.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,10 @@ def enqueue(self, job, tool=None, flush=True):
6666
configured_handler = None
6767
if tool:
6868
tool_id = tool.id
69-
configured_handler = tool.get_configured_job_handler(job.params)
69+
configured_handler = tool.get_configured_job_handler()
7070
if configured_handler is not None:
71-
p = f" (with job params: {str(job.params)})" if job.params else ""
7271
log.debug(
73-
"(%s) Configured job handler for tool '%s'%s is: %s", job.log_str(), tool_id, p, configured_handler
72+
"(%s) Configured job handler for tool '%s' is: %s", job.log_str(), tool_id, configured_handler
7473
)
7574
queue_callback = partial(self._queue_callback, job, tool_id)
7675
message_callback = partial(self._message_callback, job)

lib/galaxy/tools/__init__.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,18 +1244,15 @@ def __get_job_tool_configuration(self, job_params=None):
12441244
), f"Could not get a job tool configuration for Tool {self.id} with job_params {job_params}, this is a bug"
12451245
return rval
12461246

1247-
def get_configured_job_handler(self, job_params=None):
1248-
"""Get the configured job handler for this `Tool` given the provided `job_params`.
1247+
def get_configured_job_handler(self):
1248+
"""Get the configured job handler for this `Tool`.
12491249
12501250
Unlike the former ``get_job_handler()`` method, this does not perform "preassignment" (random selection of
12511251
a configured handler ID from a tag).
12521252
1253-
:param job_params: Any params specific to this job (e.g. the job source)
1254-
:type job_params: dict or None
1255-
12561253
:returns: str or None -- The configured handler for a job run of this `Tool`
12571254
"""
1258-
return self.__get_job_tool_configuration(job_params=job_params).handler
1255+
return self.__get_job_tool_configuration().handler
12591256

12601257
def get_job_destination(self, job_params=None):
12611258
"""

0 commit comments

Comments
 (0)