Commit 2552ab47 authored by mvdbeek's avatar mvdbeek
Browse files

Use f-strings in forward-merged code

parent 41aca51d

lib/galaxy/jobs/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -2140,7 +2140,7 @@ class JobWrapper(HasResourceParameters): 
            with open(container_exception_path) as fh:

                exception_string = fh.read()

            error_message = "Monitoring interactive tool entry point failed"

            log.error("Monitoring interactive tool entry point for job {} failed: {}".format(self.job_id, exception_string))

            log.error(f"Monitoring interactive tool entry point for job {self.job_id} failed: {exception_string}")

            self.fail(error_message)

            # local job runner uses return value to determine if we're done polling

            return True

lib/galaxy/jobs/handler.py

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ class JobHandlerQueue(Monitors): 
                    job.set_state(model.Job.states.PAUSED)

                    for dataset_assoc in job.output_datasets + job.output_library_datasets:

                        dataset_assoc.dataset.dataset.state = model.Dataset.states.PAUSED

                        dataset_assoc.dataset.info = "Execution of this dataset's job is paused because you were over {} at the time it was ready to run".format(what)

                        dataset_assoc.dataset.info = f"Execution of this dataset's job is paused because you were over {what} at the time it was ready to run"

                        self.sa_session.add(dataset_assoc.dataset.dataset)

                    self.sa_session.add(job)

                elif job_state == JOB_ERROR:

test/integration/test_interactivetools_api.py

+2 −2
Original line number Diff line number Diff line
@@ -69,9 +69,9 @@ class BaseInteractiveToolsIntegrationTestCase(ContainerizedIntegrationTestCase): 
            if len(entry_points) != expected_num:

                return None

            elif any(not e["active"] for e in entry_points):

                job_json = self._get("jobs/{}?full=true".format(job_id)).json()

                job_json = self._get(f"jobs/{job_id}?full=true").json()

                if job_json['state'] == 'error':

                    raise Exception("Interactive tool job {} failed: {}".format(job_id, job_json))

                    raise Exception(f"Interactive tool job {job_id} failed: {job_json}")

                return None

            else:

                return entry_points