[22.01] Fix macro parsing #13373
Merged
[22.01] Fix macro parsing #13373
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
bernt-matthias
force-pushed
the
fix/macro_parsing
branch
from
26e6742 to
012f44a
Compare
so far imported macro element were inserted into the macros element of the tool xml .. just to be removed again in the end (except for template macros) so it seems cleaner (and maybe a bit faster) to store the macros in lists (kept in a dict separating xml, token, and template macros)
3 tasks
mvdbeek
reviewed
Feb 15, 2022
mvdbeek
approved these changes
Feb 15, 2022
|
I guess we should test this against IUC? I'm not 100% satisfied how the code looks like (in comparison with the 21.09 state) .. but maybe this can be "fixed" later? What do you think? |
Co-authored-by: Marius van den Beek <m.vandenbeek@gmail.com>
bernt-matthias
force-pushed
the
fix/macro_parsing
branch
from
adeb2f1 to
c092b2f
Compare
We only create XmlMacroDef later on.
|
Tested in galaxyproject/tools-iuc#4367 (comment) and looks good. |
mvdbeek
approved these changes
Feb 16, 2022
|
I'm gonna take the liberty and move it out of draft, hope that's ok @bernt-matthias! |
|
This PR was merged without a "kind/" label, please correct. |
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.
fixes #13277
follow up on #13186 and #12978
The mentioned PRs tried to store the path to macro files for xml nodes loaded from imported macros (to get a more meaningful lint error message). Unfortunately lxml does this by adding a
xml:baseattribute to the nodes which has all sorts of side effects:The primary change of this PR is to revert storing this additional information.
The subsequent commits aim at speeding up parsing a bit more: So far imported macros were added to the macros node just to be removed again at the end. Now they are directly stored in lists.
How to test the changes?
(Select all options that apply)
License