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.

Sign up for GitHub

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

Jump to bottom

Support for Enhancements to gxformat2 (part II) #6811

Merged
merged 6 commits into from
Oct 10, 2018
Merged

Support for Enhancements to gxformat2 (part II) #6811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
10dae94
Fixes for specifying test_data as a parameter to run_workflow.
jmchilton Oct 1, 2018
1e20802
Toward newer style gxformat2 definitions.
jmchilton Oct 1, 2018
8ba76c9
Switch to CWL-style format 2 workflow output definitions.
jmchilton Oct 1, 2018
fd251b1
Rev gxformat2 dependencies to get latest features.
jmchilton Oct 1, 2018
915c1a9
Remove unused variable in test_workflows.
jmchilton Oct 1, 2018
a8843ec
Allow CWL-style id map for workflow inputs
jmchilton Oct 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +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.3.0
gxformat2==0.6.0
Copy link
Member

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 ?!

Copy link
Member Author

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.

Copy link
Member

@mvdbeek mvdbeek Oct 9, 2018 •
edited
Loading

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.

Copy link
Member Author

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.

h5py==2.8.0
html5lib==1.0.1
idna==2.7
Expand Down
Loading