merge release_23.1 into dev #16933
Merged
merge release_23.1 into dev #16933
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes
```
UnboundLocalError: local variable 'runner' referenced before assignment
File "galaxy/jobs/handler.py", line 541, in __handle_waiting_jobs
self.dispatcher.put(self.job_wrappers.pop(job.id))
File "galaxy/jobs/handler.py", line 1224, in put
runner = self.get_job_runner(job_wrapper, get_task_runner=True)
File "galaxy/jobs/handler.py", line 1221, in get_job_runner
return runner
```
from https://sentry.galaxyproject.org/share/issue/a0a0049feb53487f9c84ede3784624b0/
which followed `(53095435) Invalid job runner: bridges`.
[23.1] Fix unbound ``runner`` variable when there is an error in the job config
[23.1] Provide error message instead of internal server error
[23.1] Fix missing grep input in sort1 tool
…to MessageExceptions
…n_error_reporting [23.1] Improve invocation error reporting
…y_import_path_linking [23.1] Fix library import from path linking files
…import_path_linking [23.1] Test link data with extended metadata
Side-steps a problem with FileParameter in the most efficient way possible. This likely became a problem for one of Wolfgang's workflow afer we dropped some earlier unnecessary flushes.
[23.1] Skip change_datatype things if we're not actually changing the extension
github-actions
bot
added
area/testing
area/jobs
area/workflows
area/tools
area/database
4 tasks
|
The merge is fine. This is a good example of what may go wrong with code duplication and why I made the edit suggestion in #16931. Now we have two completely different statements: |
|
You can push the refactoring here in the merge if you wish, so any confusion is short-lived. |
jdavcs
reviewed
Oct 26, 2023
|
I don't think a merge PR requires approval, but just in case, +1, looks good. Thanks! |
Co-authored-by: John Davis <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
resolving conflict in
lib/galaxy/model/metadata.pyplease check @jdavcs @mvdbeek
License