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

[24.1] xsd: allow change_format and actions also in statically defined collection elements, and break recursion #18605

Merged
merged 11 commits into from
Jul 31, 2024

Conversation

bernt-matthias
Copy link
Contributor

@bernt-matthias bernt-matthias commented Jul 28, 2024

also those contained in collections. Used for instance here:

https://github.com/galaxyproject/tools-iuc/blob/695ea582a8d3bf7845dd4cddbc8b591e4b6c4e82/tools/hybpiper/hybpiper.xml#L198 https://github.com/galaxyproject/tools-iuc/blob/695ea582a8d3bf7845dd4cddbc8b591e4b6c4e82/tools/krakentools/extract_kraken_reads.xml#L145

The recursive static definition of nested collections is not clear to me. Could not find any example.

Could also target 24.1

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.

@github-actions github-actions bot added this to the 24.2 milestone Jul 28, 2024
@bernt-matthias bernt-matthias changed the title Allow change_format and actions in all data elements xsd: allow change_format and actions in all data elements Jul 28, 2024
@mvdbeek
Copy link
Member

mvdbeek commented Jul 28, 2024

If these work then we should add this as a bug fix to 24.1

@bernt-matthias
Copy link
Contributor Author

In the commit message of #17236 you noted that change_format is not implemented: https://github.com/galaxyproject/tools-iuc/blob/695ea582a8d3bf7845dd4cddbc8b591e4b6c4e82/tools/krakentools/extract_kraken_reads.xml#L145

I'm not sure about this, the parser uses the same function for data in collection elements as for top level data elements.

I think the recursion in the xsd has been introduced also i this PR, or?

@bernt-matthias
Copy link
Contributor Author

bernt-matthias commented Jul 29, 2024

Should be about it.

  • I think discover_datasets in collection - data makes no sense. I will remove it.
    • also seems not possible, gave me Cannot pre-determine structure for collection of type list when I tried it.
  • Would like to test if filter in collection - data works. Would be fancy, but I can not think of a use case.
    • Does not work (see c0ce2a7): For paired collection the definition is impossible, since we can not have multiple collection elements with the same name. For list the filter just does not work.
  • Add a test for action in collection - data

@bernt-matthias bernt-matthias changed the base branch from dev to release_24.1 July 30, 2024 11:02
@bernt-matthias bernt-matthias changed the title xsd: allow change_format and actions in all data elements [24.1] xsd: allow change_format and actions also in statically defined collection elements, and break recursion Jul 30, 2024
Copy link
Member

@mvdbeek mvdbeek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That looks like a solid cleanup, thank you!

@mvdbeek mvdbeek merged commit 745913d into galaxyproject:release_24.1 Jul 31, 2024
53 of 56 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.

2 participants