-
Notifications
You must be signed in to change notification settings - Fork 982
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
Support for Enhancements to gxformat2 (part II) #6811
Conversation
c91f363
to
da46d42
Compare
@@ -55,6 +55,7 @@ functools32==3.2.3.post2; python_version == '2.7' | |||
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Something unexpected is going on here, after merging #6807 there should be a merge conflict here, but there isn't ?!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll rebase - I'm sure it will generate a cleaner diff against dev then.
da46d42
to
a8843ec
Compare
Further extends #6807 and #6746 with more Format 2 workflow tweaks.
This:
in
keyword 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
outputSource
on workflow steps instead ofsource
.