Skip to content
This repository was archived by the owner on Jul 24, 2020. It is now read-only.

Add more flexibility to mulled operations.#50

Merged
bgruening merged 1 commit intogalaxyproject:masterfrom
jmchilton:mulled_options
Feb 28, 2017
Merged

Add more flexibility to mulled operations.#50
bgruening merged 1 commit intogalaxyproject:masterfrom
jmchilton:mulled_options

Conversation

@jmchilton
Copy link
Member

Clean up verbose handling and such but the major fix is the addition of allowing a specified version of Conda to be installed before building images - this is required to work around certain packages such ncurses not working under osxfs and conda=4.2. This is fixed with Conda 4.3.

Likely this bug is related to conda/conda#3494.

Clean up verbose handling, make images configurable, and such. The major fix is the addition of allowing a specified version of Conda to be installed before building images - this is required to work around certain packages such ncurses not working under osxfs and conda=4.2. This is fixed with Conda 4.3.

Likely this bug is related to conda/conda#3494.
end

local conda_image = VAR.CONDA_IMAGE
if conda_image == '' then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't have command line switches for this added, isn't it?

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 didn't - it was for if your playing around with the involucro command directly I guess. I can update this with an option at the mulled level if you'd like.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok!

@bgruening bgruening merged commit 82a45e3 into galaxyproject:master Feb 28, 2017
@jmchilton
Copy link
Member Author

Thanks for the merge @bgruening !

jmchilton added a commit that referenced this pull request Mar 1, 2017
jmchilton added a commit to jmchilton/galaxy that referenced this pull request Mar 9, 2017
- I added more flexibility to mulled operations to work around bugs on OS X (galaxyproject/galaxy-lib#50).
- I added the ability to use local packages with the Conda resolver (galaxyproject/galaxy-lib#47) - this allows Galaxy when used with Planemo to use locally built packages.
- I switched the default Conda prefix to miniconda3 so the name matches what Galaxy is actually installing. galaxyproject/galaxy-lib#48. This would never actually be used with Galaxy since we decided it should maintain its own prefix rather than using the default - it is important for Planemo though.

There are some other bug fixes outside of these three main PRs related to the second point - minor refinements to get conda-build dependencies working and working automatically.
 - galaxyproject/galaxy-lib@bdacc4d
 - galaxyproject/galaxy-lib@1b7bca6
 - galaxyproject/galaxy-lib@36b2e65
jmchilton added a commit to jmchilton/galaxy that referenced this pull request Mar 11, 2017
- I added more flexibility to mulled operations to work around bugs on OS X (galaxyproject/galaxy-lib#50).
- I added the ability to use local packages with the Conda resolver (galaxyproject/galaxy-lib#47) - this allows Galaxy when used with Planemo to use locally built packages. Including Nicola's suggested changes here (galaxyproject/galaxy-lib@6d53fc7).
- I switched the default Conda prefix to miniconda3 so the name matches what Galaxy is actually installing. galaxyproject/galaxy-lib#48. This would never actually be used with Galaxy since we decided it should maintain its own prefix rather than using the default - it is important for Planemo though.
- I synced the galaxy.tools.cwl package with my latest downstream work that provides updates for latest developments in cwltool. galaxyproject/galaxy-lib#53
- I added the ability to load tools via URI-like strings in addition to simple paths - this allows referencing URLs and Dockstore/GA4GH tools directly from the command-line with Planemo. galaxyproject/galaxy-lib#52

There are some other bug fixes outside of these three main PRs related to the second point - minor refinements to get conda-build dependencies working and working automatically.
 - galaxyproject/galaxy-lib@bdacc4d
 - galaxyproject/galaxy-lib@1b7bca6
 - galaxyproject/galaxy-lib@36b2e65
jmchilton added a commit to jmchilton/galaxy that referenced this pull request Mar 13, 2017
- I added more flexibility to mulled operations to work around bugs on OS X (galaxyproject/galaxy-lib#50).
- I added the ability to use local packages with the Conda resolver (galaxyproject/galaxy-lib#47) - this allows Galaxy when used with Planemo to use locally built packages. Including Nicola's suggested changes here (galaxyproject/galaxy-lib@6d53fc7).
- I switched the default Conda prefix to miniconda3 so the name matches what Galaxy is actually installing. galaxyproject/galaxy-lib#48. This would never actually be used with Galaxy since we decided it should maintain its own prefix rather than using the default - it is important for Planemo though.
- I synced the galaxy.tools.cwl package with my latest downstream work that provides updates for latest developments in cwltool. galaxyproject/galaxy-lib#53
- I added the ability to load tools via URI-like strings in addition to simple paths - this allows referencing URLs and Dockstore/GA4GH tools directly from the command-line with Planemo. galaxyproject/galaxy-lib#52

There are some other bug fixes outside of these three main PRs related to the second point - minor refinements to get conda-build dependencies working and working automatically.
 - galaxyproject/galaxy-lib@bdacc4d
 - galaxyproject/galaxy-lib@1b7bca6
 - galaxyproject/galaxy-lib@36b2e65
jmchilton added a commit to jmchilton/galaxy that referenced this pull request Mar 13, 2017
- I added more flexibility to mulled operations to work around bugs on OS X (galaxyproject/galaxy-lib#50).
- I added the ability to use local packages with the Conda resolver (galaxyproject/galaxy-lib#47) - this allows Galaxy when used with Planemo to use locally built packages. Including Nicola's suggested changes here (galaxyproject/galaxy-lib@6d53fc7).
- I switched the default Conda prefix to miniconda3 so the name matches what Galaxy is actually installing. galaxyproject/galaxy-lib#48. This would never actually be used with Galaxy since we decided it should maintain its own prefix rather than using the default - it is important for Planemo though.
- I synced the galaxy.tools.cwl package with my latest downstream work that provides updates for latest developments in cwltool. galaxyproject/galaxy-lib#53
- I added the ability to load tools via URI-like strings in addition to simple paths - this allows referencing URLs and Dockstore/GA4GH tools directly from the command-line with Planemo. galaxyproject/galaxy-lib#52

There are some other bug fixes outside of these three main PRs related to the second point - minor refinements to get conda-build dependencies working and working automatically.
 - galaxyproject/galaxy-lib@bdacc4d
 - galaxyproject/galaxy-lib@1b7bca6
 - galaxyproject/galaxy-lib@36b2e65
jmchilton added a commit to jmchilton/galaxy that referenced this pull request Mar 14, 2017
- I added more flexibility to mulled operations to work around bugs on OS X (galaxyproject/galaxy-lib#50).
- I added the ability to use local packages with the Conda resolver (galaxyproject/galaxy-lib#47) - this allows Galaxy when used with Planemo to use locally built packages. Including Nicola's suggested changes here (galaxyproject/galaxy-lib@6d53fc7).
- I switched the default Conda prefix to miniconda3 so the name matches what Galaxy is actually installing. galaxyproject/galaxy-lib#48. This would never actually be used with Galaxy since we decided it should maintain its own prefix rather than using the default - it is important for Planemo though.
- I synced the galaxy.tools.cwl package with my latest downstream work that provides updates for latest developments in cwltool. galaxyproject/galaxy-lib#53
- I added the ability to load tools via URI-like strings in addition to simple paths - this allows referencing URLs and Dockstore/GA4GH tools directly from the command-line with Planemo. galaxyproject/galaxy-lib#52

There are some other bug fixes outside of these three main PRs related to the second point - minor refinements to get conda-build dependencies working and working automatically.
 - galaxyproject/galaxy-lib@bdacc4d
 - galaxyproject/galaxy-lib@1b7bca6
 - galaxyproject/galaxy-lib@36b2e65
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants