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

Allow conda to be configured to use locally built packages. #47

Merged
merged 1 commit into from
Feb 24, 2017

Conversation

jmchilton
Copy link
Member

This is required to run tests and such with new and updated local packages before they have been published.

This is required to run tests and such with new and updated local packages before they have been published.
Copy link
Member

@mvdbeek mvdbeek left a comment

Choose a reason for hiding this comment

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

Looks good!

@@ -54,7 +55,8 @@ class CondaContext(installable.InstallableContext):

def __init__(self, conda_prefix=None, conda_exec=None,
shell_exec=None, debug=False, ensure_channels='',
condarc_override=None, use_path_exec=USE_PATH_EXEC_DEFAULT, copy_dependencies=False):
condarc_override=None, use_path_exec=USE_PATH_EXEC_DEFAULT,
use_local=USE_LOCAL_DEFAULT, copy_dependencies=False):
Copy link
Member

Choose a reason for hiding this comment

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

I think I'd add use_local as last parameter (at least for consistency with how you call it in galaxy/tools/deps/resolvers/conda.py)

@jmchilton jmchilton merged commit 5ca2847 into galaxyproject:master Feb 24, 2017
@jmchilton
Copy link
Member Author

Awesome - thanks for the reviews all. I made the change requested in master @nsoranzo.

@jmchilton jmchilton deleted the use_local branch February 24, 2017 13:18
@jmchilton
Copy link
Member Author

Test case for this PR included in galaxyproject/planemo#643.

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.

4 participants