Support for Enhancements to gxformat2 (part II)#6811
Merged
jmchilton merged 6 commits intogalaxyproject:devfrom Oct 10, 2018
Merged
Support for Enhancements to gxformat2 (part II)#6811jmchilton merged 6 commits intogalaxyproject:devfrom
jmchilton merged 6 commits intogalaxyproject:devfrom
Conversation
c91f363 to
da46d42
Compare
mvdbeek
reviewed
Oct 7, 2018
| future==0.16.0 | ||
| futures==3.2.0; python_version == '2.6' or python_version == '2.7' | ||
| galaxy-sequence-utils==1.1.3 | ||
| gxformat2==0.6.0 |
Member
There was a problem hiding this comment.
Something unexpected is going on here, after merging #6807 there should be a merge conflict here, but there isn't ?!
Member
Author
There was a problem hiding this comment.
This PR had that PRs exact commits - so they don't conflict. I changed this line twice - once in commits in that PR and again in a commit only in this PR.
Member
There was a problem hiding this comment.
Alright, I was assuming the context in the github interface would at least show a bump from 0.3.1 to 0.6.0 and not show the commits that are already integrated -- although I guess this is a nice "feature" for stale PRs.
Member
Author
There was a problem hiding this comment.
I'll rebase - I'm sure it will generate a cleaner diff against dev then.
da46d42 to
a8843ec
Compare
mvdbeek
approved these changes
Oct 9, 2018
This file contains hidden or 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
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.
Further extends #6807 and #6746 with more Format 2 workflow tweaks.
This:
inkeyword for connections introduced in Support for Enhancements to gxformat2. #6807.The id map based approach replaces arrays for inputs and outputs. Like CWL both are allowed, but also like CWL the newer id map based approach is probably preferred.
For an input definition, the following diff describes the change:
For simpler data inputs without extra modifiers, a simpler map can be used:
For an output definition, the following diff describes the change:
While not particularly more concise, it does bring the syntax inline with CWL - which uses
outputSourceon workflow steps instead ofsource.