Update against galaxy-lib#5602
Merged
nsoranzo merged 2 commits intogalaxyproject:devfrom Feb 26, 2018
Merged
Conversation
Includes: - Fixes for multi-requirement container building via mulled via galaxyproject/galaxy-lib#84. - Fixes for Conda search problems galaxyproject/galaxy-lib#83. - Updates to CWL library support galaxyproject/galaxy-lib#78. - Make bz2file dependency optional (xref galaxyproject/galaxy-lib#79) - Python 3 fixes for path stuff - runtime fixes caught because galaxy-lib runs tests using Python 3 galaxyproject/galaxy-lib@c056e39 and galaxyproject/galaxy-lib@c7cc9ca) - Python 3 fix for linter (galaxyproject/galaxy-lib@17d1676).
Member
|
Thanks @jmchilton! |
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
2 participants
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.
Includes:
Redo of #5584 - I think the only things I changed were in galaxy.tools.deps.mulled. I double checked everything based on @nsoranzo's catch and undid a bunch changes in this commit that were undoing things (I'm used to people developing that package from the galaxy-lib side). I also noticed a problem where the last time I merged Galaxy into galaxy-lib I did that wrong and so this commit now includes galaxyproject/galaxy-lib@0c69916 which restores a change that was in galaxyproject/galaxy-lib#84 mentioned above. I also double checked that all the recent Python 3 work in still reflected in galaxy.tools.cwl and it seems to be.
xref. #1715