Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 23.1 into dev #16848

Merged
merged 5 commits into from
Oct 13, 2023
Merged

Merge 23.1 into dev #16848

merged 5 commits into from
Oct 13, 2023

Conversation

mvdbeek
Copy link
Member

@mvdbeek mvdbeek commented Oct 13, 2023

(Please replace this header with a description of your pull request. Please include BOTH what you did and why you made the changes. The "why" may simply be citing a relevant Galaxy issue.)
(If fixing a bug, please add any relevant error or traceback)
(For UI components, it is recommended to include screenshots or screencasts)

How to test the changes?

(Select all options that apply)

  • I've included appropriate automated tests.
  • This is a refactoring of components with existing test coverage.
  • Instructions for manual testing are as follows:
    1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]

License

  • I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

mvdbeek and others added 5 commits October 12, 2023 00:55
And remove the step.type is None condition, which I don't think can
happen and even if it can, would have already failed at the module
inection in module_factory.from_workflow_step.
They don't have the version in the tool id, so we need to explicitly
include tool_version.
…on_handling

[23.1] Fix up local tool version handling
@github-actions github-actions bot added this to the 23.2 milestone Oct 13, 2023
@mvdbeek mvdbeek added the merge label Oct 13, 2023
@mvdbeek mvdbeek merged commit ff9d610 into galaxyproject:dev Oct 13, 2023
43 of 44 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants