Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: galaxyproject/galaxy
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 198f52c0474101249f4047a9d1a85fdd334be8f4
Choose a base ref
..
head repository: galaxyproject/galaxy
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cb950f54332bcb8bdc1806805fdae7a1c2a199ea
Choose a head ref
Showing with 6 additions and 4 deletions.
  1. +5 −4 lib/galaxy/jobs/__init__.py
  2. +1 −0 lib/galaxy/util/topsort.py
9 changes: 5 additions & 4 deletions lib/galaxy/jobs/__init__.py
Original file line number Diff line number Diff line change
@@ -996,7 +996,7 @@ def __init__(
self.job_id = job.id
self.session_id = job.session_id
self.user_id = job.user_id
self.app: MinimalManagerApp = app
self.app = app
self.tool = tool
self.sa_session = self.app.model.context
self.extra_filenames: List[str] = []
@@ -2539,12 +2539,13 @@ def set_container(self, container):


class JobWrapper(MinimalJobWrapper):
def __init__(self, job, queue: "JobHandlerQueue", use_persisted_destination=False, app=None):
def __init__(self, job, queue: "JobHandlerQueue", use_persisted_destination=False):
app = queue.app
super().__init__(
job,
app=queue.app,
app=app,
use_persisted_destination=use_persisted_destination,
tool=self.app.toolbox.get_tool(job.tool_id, job.tool_version, exact=True),
tool=app.toolbox.get_tool(job.tool_id, job.tool_version, exact=True),
)
self.queue = queue
self.job_runner_mapper = JobRunnerMapper(self, queue.dispatcher.url_to_destination, self.app.job_config)
1 change: 1 addition & 0 deletions lib/galaxy/util/topsort.py
Original file line number Diff line number Diff line change
@@ -36,6 +36,7 @@
many methods to help analyze and break the cycles. This requires
a good deal more code than topsort itself!
"""

from random import choice