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

Implement default_identifier_source for outputs and sort input keys by default #4368

Merged
merged 4 commits into from Aug 7, 2017

Conversation

Projects
None yet
3 participants
@mvdbeek
Copy link
Member

commented Aug 2, 2017

  • 9d6a0e8: Implement default_identifier_source for output. This allows tool authors to specify an input from which the element identifier can be inherited. This applies only to non-collection output when mapping a collection over an input, since collections have a structured_like attribute

  • 35c0a47: Adds an API test for this functionality

  • 46fba6e: sorts the input keys by default so that when 2 collections are mapped over and are equally likely to be the source of element identifiers, the first one will be used.

This solves #4366 (mostly).

mvdbeek added some commits Aug 2, 2017

Implement default_identifier_source for outputs
This allows tool authors to specify an input from which the element
identifier can be inherited. This applies only to non-collection output
when mapping a collection over an input, since collections have a
structured_like attribute.

@mvdbeek mvdbeek changed the title Implement default_identifier_source for outputs and sort input keys by default [WIP] Implement default_identifier_source for outputs and sort input keys by default Aug 3, 2017

@mvdbeek mvdbeek added status/WIP and removed status/review labels Aug 3, 2017

@mvdbeek

This comment has been minimized.

Copy link
Member Author

commented Aug 3, 2017

Discovered some issues with more complex inputs, so putting this back in WIP.

@mvdbeek mvdbeek changed the title [WIP] Implement default_identifier_source for outputs and sort input keys by default Implement default_identifier_source for outputs and sort input keys by default Aug 3, 2017

@mvdbeek

This comment has been minimized.

Copy link
Member Author

commented Aug 3, 2017

Stupid me was trying to match collections of differing lengths ... d'oh. Works nicely now, but we should prevent users from doing this.

@jmchilton jmchilton merged commit e92a15a into galaxyproject:dev Aug 7, 2017

5 checks passed

api test Build finished. 280 tests run, 1 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 150 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 37 tests run, 0 skipped, 0 failed.
Details
toolshed test Build finished. 579 tests run, 0 skipped, 0 failed.
Details
@jmchilton

This comment has been minimized.

Copy link
Member

commented Aug 7, 2017

Thanks for the enhancement @mvdbeek - this looks great!

@jmchilton

This comment has been minimized.

Copy link
Member

commented Aug 7, 2017

I assume since you switched the title you meant to switch the tag as well - can you do that just to clarify this was indeed out of WIP?

@mvdbeek mvdbeek added status/review and removed status/WIP labels Aug 7, 2017

@mvdbeek

This comment has been minimized.

Copy link
Member Author

commented Aug 7, 2017

Yep, that's right, thanks @jmchilton !

@@ -78,6 +78,7 @@
<tool file="validation_empty_dataset.xml" />
<tool file="implicit_conversion.xml" />
<tool file="explicit_conversion.xml" />
<tool file="identifier_source.xml" />

This comment has been minimized.

Copy link
@nsoranzo

nsoranzo Aug 7, 2017

Member

@mvdbeek It seems identifier_source.xml is missing from this PR.

This comment has been minimized.

Copy link
@mvdbeek

mvdbeek Aug 7, 2017

Author Member

thanks @nsoranzo, I'll add it !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.