Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: fd9eb822b470dfedc508511ae27e79fd02f317b3 https://github.com/galaxyproject/galaxy/commit/fd9eb822b470dfedc508511ae27e7... Author: Brad Langhorst <langhorst@neb.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py Log Message: ----------- WIP re #39 - run dependency management during repository installation working: - fetching valid tool list - identifying unique requirements not working: File '/Users/langhorst/src/galaxy_hackathon/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py', line 1138 in prepare_for_install [view.manager_dependency(req) for req in uniq_reqs.values()] TypeError: manager_dependency() takes exactly 1 argument (2 given) Commit: dcb57a6f17f5f351d585bb2b0535c0f0c04c9f4f https://github.com/galaxyproject/galaxy/commit/dcb57a6f17f5f351d585bb2b0535c... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py Log Message: ----------- Need to unnpack kwargs (ping @bwlang) Commit: de6bbf1f755ac6659ff733146a396013cebbf231 https://github.com/galaxyproject/galaxy/commit/de6bbf1f755ac6659ff733146a396... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/util/shed_util_common.py Log Message: ----------- Move get_unique_requirements to shed_util_common (ping @bwlang) Commit: 179d02c701ad92902ec7c718a4c453de1fff858b https://github.com/galaxyproject/galaxy/commit/179d02c701ad92902ec7c718a4c45... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/tool_shed/util/shed_util_common.py Log Message: ----------- Iterate over all tools in a repository Commit: f7d5f5d1912c46fa024bd61adedbee3e7f059a03 https://github.com/galaxyproject/galaxy/commit/f7d5f5d1912c46fa024bd61adedbe... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/tool_shed/util/shed_util_common.py Log Message: ----------- Fix the parsing logic Commit: 07ed963d8b4cac3ebec3af1289908eb6566b8b11 https://github.com/galaxyproject/galaxy/commit/07ed963d8b4cac3ebec3af1289908... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/tool_shed/util/shed_util_common.py Log Message: ----------- Be a bit more defensive about parsing requirements Commit: f0f6d88e34ece5e083e960e1cf1d2eb750226feb https://github.com/galaxyproject/galaxy/commit/f0f6d88e34ece5e083e960e1cf1d2... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/tool_shed/util/shed_util_common.py Log Message: ----------- Fix indentation Commit: e7aaf99392c95ded8f620adc2827700c1a3d3f2a https://github.com/galaxyproject/galaxy/commit/e7aaf99392c95ded8f620adc28277... Author: Brad Langhorst <langhorst@neb.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py Log Message: ----------- passed a “manual install” argument to the dependency resolve so that we can both respect a users wishes (independent of auto_install config) and so that we can avoid attempting to create a conda_env in a nonexistent job directory Commit: 523baf380fe5798e3838480f802feda582361746 https://github.com/galaxyproject/galaxy/commit/523baf380fe5798e3838480f802fe... Author: Brad Langhorst <langhorst@neb.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/deps/views.py Log Message: ----------- Probably better not to have a fake directory here… other places check for job_directory=None Commit: 0252acce55f32c2751570547c4ddc4548e5d29c1 https://github.com/galaxyproject/galaxy/commit/0252acce55f32c2751570547c4ddc... Author: Brad Langhorst <langhorst@neb.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako Log Message: ----------- ask for tool dependency installation always. I think a tool with no requirements is probably rare, and the new language should cover that situation. I think it’s not worth the API call to fetch the requirements just to ask this question. Commit: dade96c4af3a265010fd068e3d9562612996aff7 https://github.com/galaxyproject/galaxy/commit/dade96c4af3a265010fd068e3d956... Author: Brad Langhorst <langhorst@neb.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py Log Message: ----------- this view is not necessary for the current implementation Commit: 609898b73c8a11412b110c0e6370617a95cf3a89 https://github.com/galaxyproject/galaxy/commit/609898b73c8a11412b110c0e63706... Author: Brad Langhorst <langhorst@neb.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M templates/admin/tool_shed_repository/common.mako Log Message: ----------- strangely… we need %if tool_dependencies_root_folder or missing_tool_dependencies_root_folder: to avoid breaking the export repository code Commit: c59fd5ec955c853f8306622d669a095562ed6350 https://github.com/galaxyproject/galaxy/commit/c59fd5ec955c853f8306622d669a0... Author: Brad Langhorst <langhorst@neb.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py Log Message: ----------- resolving style issue better comments Commit: 753587931ed3a460e57334de398d5048bc35f6b9 https://github.com/galaxyproject/galaxy/commit/753587931ed3a460e57334de398d5... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/resolvers/galaxy_packages.py M lib/galaxy/tools/toolbox/base.py A lib/galaxy/tools/toolbox/requirements.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/buildapp.py Log Message: ----------- Add api route to fetch all requirements and method that determines requirement status This should be used in the UI to inform the admin of the dependency resolution status. Also make galaxy package resolution more robust to other files in the shed_tools directory (like condarc). Commit: 1a9e2e72663902287a2963464d38894aa6f8e4aa https://github.com/galaxyproject/galaxy/commit/1a9e2e72663902287a2963464d388... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/util/shed_util_common.py M templates/admin/tool_shed_repository/manage_repository.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- Continue dependency resolver API routes and start work on displaying dependency status on a per repository view Commit: 672480fb1b6e1ff2b58f9f1e1fd11f4692884d74 https://github.com/galaxyproject/galaxy/commit/672480fb1b6e1ff2b58f9f1e1fd11... Author: Brad Langhorst <langhorst@neb.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- Add first pass for displaying dependency status info Commit: a8068679dae232a2eb7f119f367b2c7c7ff76b71 https://github.com/galaxyproject/galaxy/commit/a8068679dae232a2eb7f119f367b2... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Add name and version to returned dependency Commit: 2a7f67b8b508536ca6828d78f1f3a1c7bfb0460b https://github.com/galaxyproject/galaxy/commit/2a7f67b8b508536ca6828d78f1f3a... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py Log Message: ----------- Hack in name and version into dictified representation of Dependency instance (For NullDependency we do want to show the missing requirements) Commit: 4bd0013648c589deb1be6191ece977dd6e13075c https://github.com/galaxyproject/galaxy/commit/4bd0013648c589deb1be6191ece97... Author: Brad Langhorst <langhorst@neb.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- add status field with icons Commit: ee33ad8f6065ac9e8c674db61ac939a66eb7c063 https://github.com/galaxyproject/galaxy/commit/ee33ad8f6065ac9e8c674db61ac93... Author: Brad Langhorst <langhorst@neb.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- whitespace fix Commit: e7f8a13ecb9189c0b1a553bf3532b7849f5cc84e https://github.com/galaxyproject/galaxy/commit/e7f8a13ecb9189c0b1a553bf3532b... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/__init__.py M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Address @nsoranzo's review. - Skip unncessary list() - Sort keys when dumping requirements to json - Rename tools_requirements to all_tools_requirements - Use list comprehension where appropriate Commit: cc085cb9a2f3afb2467e5bbe8192bf6b7a9021bf https://github.com/galaxyproject/galaxy/commit/cc085cb9a2f3afb2467e5bbe8192b... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Work on conda install revision Commit: 69480a6c041973d6aa507ba6d2e568f848a7d397 https://github.com/galaxyproject/galaxy/commit/69480a6c041973d6aa507ba6d2e56... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py Log Message: ----------- Fix dependency typo Commit: 7a8265b0b0f2301516bde01e5b4f7e2bab75baa5 https://github.com/galaxyproject/galaxy/commit/7a8265b0b0f2301516bde01e5b4f7... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/views.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/util/shed_util_common.py M templates/admin/tool_shed_repository/manage_repository.mako M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- Make api return more detailed requirements status, move tool_requirements and tool_requirements_status to Tool class Commit: 983f4a09195be21dcb77fc355b16310ca5e976af https://github.com/galaxyproject/galaxy/commit/983f4a09195be21dcb77fc355b163... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/__init__.py M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Use list comprehension to generate list of all requirements Commit: 2e7099c772e25c0e0a40c4729716b66c6c132a51 https://github.com/galaxyproject/galaxy/commit/2e7099c772e25c0e0a40c4729716b... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Fix logic error in message Commit: 93579a6373712b53678f585a1a4d074d75d18bdd https://github.com/galaxyproject/galaxy/commit/93579a6373712b53678f585a1a4d0... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/deps/views.py M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- Display whether dependency is exactly resolved (check), inexactly resolved (warning) or not resolved (error) Commit: 602ced89ce31e1d6e6a358f2cfacbe148890b57e https://github.com/galaxyproject/galaxy/commit/602ced89ce31e1d6e6a358f2cfacb... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Close docstring example list Commit: f75a28e87c5453b8ed3cc3d2c56d74f5aae37a11 https://github.com/galaxyproject/galaxy/commit/f75a28e87c5453b8ed3cc3d2c56d7... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/tool_shed/galaxy_install/install_manager.py Log Message: ----------- Trigger requirement install for new install method Commit: 414bc87d371b3ca593cffaf1b9c49ccb7ade58cd https://github.com/galaxyproject/galaxy/commit/414bc87d371b3ca593cffaf1b9c49... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/deps/views.py M lib/tool_shed/galaxy_install/install_manager.py Log Message: ----------- flake8 fixes Commit: 4eadf05ae9f9593694d71ecd91e1639c3d24b08a https://github.com/galaxyproject/galaxy/commit/4eadf05ae9f9593694d71ecd91e16... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/views.py M lib/galaxy/webapps/galaxy/api/tool_dependencies.py M lib/galaxy/webapps/galaxy/buildapp.py Log Message: ----------- Add API endpoint to install (resolver) dependencies Commit: 503915fbdc9707a64fed8849ed77fefa3a0af434 https://github.com/galaxyproject/galaxy/commit/503915fbdc9707a64fed8849ed77f... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/tool_dependencies.py Log Message: ----------- Correct module description Commit: db0531315823e656662a6ca7d9bcaba7fc7be255 https://github.com/galaxyproject/galaxy/commit/db0531315823e656662a6ca7d9bca... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/galaxy_install/install_manager.py Log Message: ----------- Trigger dependency installation in InstallRepositoryManager Commit: dcba01846d36de1a19df04203a6d074398cd0388 https://github.com/galaxyproject/galaxy/commit/dcba01846d36de1a19df04203a6d0... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/deps/views.py Log Message: ----------- Add docstring to install_dependency Commit: a8670a2fb096beea324ba86ae5ebf184f4c8854b https://github.com/galaxyproject/galaxy/commit/a8670a2fb096beea324ba86ae5ebf... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Revert manual_install mode (unncessary, better to use install_dependency) Commit: 6901cb1e9e6a4b3ab67709231251ddfce108809c https://github.com/galaxyproject/galaxy/commit/6901cb1e9e6a4b3ab67709231251d... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/deps/views.py Log Message: ----------- Introduce installable_resolver property Commit: 33b83e5c70d356168648b022d9c8d106d7182c1b https://github.com/galaxyproject/galaxy/commit/33b83e5c70d356168648b022d9c8d... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/galaxy_install/install_manager.py M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/preview_repository.mako M templates/admin/tool_shed_repository/reselect_tool_panel_section.mako M templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako Log Message: ----------- Add install resolver dependency button and add install_resolver_dependency to ToolShedRepositoriesController Commit: 4ed151a771e0f855571c837b604eea1f3baf01fc https://github.com/galaxyproject/galaxy/commit/4ed151a771e0f855571c837b604ee... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-22 (Fri, 22 Jul 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/views.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/galaxy_install/repair_repository_manager.py M templates/admin/tool_shed_repository/common.mako M templates/webapps/tool_shed/repository/export_repository.mako M test/shed_functional/base/twilltestcase.py Log Message: ----------- Revert mako hack to always display install_tool_dependency button - Add resolver checkbox - Add possibility to disable resolvers if initialization failed Commit: 886d074a9ed8c8916a4d29c8397e71df8ac2e0e7 https://github.com/galaxyproject/galaxy/commit/886d074a9ed8c8916a4d29c8397e7... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-23 (Sat, 23 Jul 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Make conda verbose install check configurable Move dependency installation from resolve() to install_dependency(). Commit: 201863200e824c98c8689b1c5fab145247f49d3c https://github.com/galaxyproject/galaxy/commit/201863200e824c98c8689b1c5fab1... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-23 (Sat, 23 Jul 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py M lib/tool_shed/util/shed_util_common.py Log Message: ----------- Only return requirements of type package (for now) Commit: 0b242833959a5554d60488d6551da78c816020d4 https://github.com/galaxyproject/galaxy/commit/0b242833959a5554d60488d6551da... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-23 (Sat, 23 Jul 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/brewed_tool_shed_packages.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/resolvers/galaxy_packages.py M lib/galaxy/tools/deps/resolvers/homebrew.py M lib/galaxy/tools/deps/resolvers/modules.py M lib/galaxy/tools/deps/resolvers/resolver_mixins.py M lib/galaxy/tools/deps/resolvers/tool_shed_packages.py M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py M lib/galaxy/tools/deps/views.py M lib/galaxy/webapps/galaxy/api/tool_dependencies.py M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- Use resolver.find_dep to determine dependency status Commit: b59b797f5036b492e6abee8757d487ad80e174af https://github.com/galaxyproject/galaxy/commit/b59b797f5036b492e6abee8757d48... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-25 (Mon, 25 Jul 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py Log Message: ----------- Update INDETERMINATE_DEPENDENCY use to NullDependency instance Commit: c10d1cb172eb6458e8ad3ee6ca7f4f27665e619c https://github.com/galaxyproject/galaxy/commit/c10d1cb172eb6458e8ad3ee6ca7f4... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-25 (Mon, 25 Jul 2016) Changed paths: M lib/galaxy/tools/__init__.py Log Message: ----------- Remove unused DependencyResolver view from ToolBox Commit: 49dee6af10fdc81fec37fd593c4bd5537511ccd3 https://github.com/galaxyproject/galaxy/commit/49dee6af10fdc81fec37fd593c4bd... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-25 (Mon, 25 Jul 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py Log Message: ----------- Flake8 fix Commit: 6b135c6b1e04726c9cd8644a43601efe1e1cc96c https://github.com/galaxyproject/galaxy/commit/6b135c6b1e04726c9cd8644a43601... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-25 (Mon, 25 Jul 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/brewed_tool_shed_packages.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/resolvers/galaxy_packages.py M lib/galaxy/tools/deps/resolvers/homebrew.py M lib/galaxy/tools/deps/resolvers/modules.py M lib/galaxy/tools/deps/resolvers/resolver_mixins.py M lib/galaxy/tools/deps/resolvers/tool_shed_packages.py M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py Log Message: ----------- Drop INDETERMINATE_DEPENDENCY alias Commit: dd8f8f1de0adcfec7c85e70e8e60645f664ae697 https://github.com/galaxyproject/galaxy/commit/dd8f8f1de0adcfec7c85e70e8e606... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-25 (Mon, 25 Jul 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py Log Message: ----------- Fix NullDependency use and add default arguments to NullDependency Commit: b5fad4a04804e6cefec335fe888bf616c7eb7e0d https://github.com/galaxyproject/galaxy/commit/b5fad4a04804e6cefec335fe888bf... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-25 (Mon, 25 Jul 2016) Changed paths: A test/integration/test_resolvers.py Log Message: ----------- Add api test for conda dependency resolution Commit: deef480cadaf6161e1f59033925936d7eb7353c1 https://github.com/galaxyproject/galaxy/commit/deef480cadaf6161e1f5903392593... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-26 (Tue, 26 Jul 2016) Changed paths: M test/integration/test_resolvers.py Log Message: ----------- Add more API tests for resolver dependencies Commit: e53a81c40d29686d00580349bae4482f21024a01 https://github.com/galaxyproject/galaxy/commit/e53a81c40d29686d00580349bae44... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-26 (Tue, 26 Jul 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/tool_dependencies.py M test/integration/test_resolvers.py Log Message: ----------- Fix syntax, return None if dependency not found Commit: 9917512f8f2e3193dba0fded5f9927ecb1158095 https://github.com/galaxyproject/galaxy/commit/9917512f8f2e3193dba0fded5f992... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-26 (Tue, 26 Jul 2016) Changed paths: M test/integration/test_resolvers.py Log Message: ----------- Revert svgwrite import, fixed in #2656 Commit: 645a89170604089c3a0b9e34bd4c50733b2bf3c6 https://github.com/galaxyproject/galaxy/commit/645a89170604089c3a0b9e34bd4c5... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-26 (Tue, 26 Jul 2016) Changed paths: M test/integration/test_resolvers.py Log Message: ----------- Remove reference to /tmp Commit: 06e409ad401e4e0d099493e9443886d25a701935 https://github.com/galaxyproject/galaxy/commit/06e409ad401e4e0d099493e944388... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-27 (Wed, 27 Jul 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Use continue instead of unused NullDependency in Dependency_Manager.find_dep(), and requirement.version instead of None in Dependency_Manager.find_dep.dependency_shell_commands(). (thanks @nsoranzo) Commit: 2a5b043aaf8da9051ef959e4f9cf2dac99b9383a https://github.com/galaxyproject/galaxy/commit/2a5b043aaf8da9051ef959e4f9cf2... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-27 (Wed, 27 Jul 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Simplify conda install logic Commit: 8cca7bef760691eedadac3e9f377efc22c63f92c https://github.com/galaxyproject/galaxy/commit/8cca7bef760691eedadac3e9f377e... Author: John Chilton <jmchilton@gmail.com> Date: 2016-07-27 (Wed, 27 Jul 2016) Changed paths: M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako Log Message: ----------- Show conda install option even when no tool_dependencies.xml is available. Also reword different install options, I hope this is more clear - I do think it exposes les of the internal language to the end user. Commit: 483b66be270314859370f1ee84afbdae34460391 https://github.com/galaxyproject/galaxy/commit/483b66be270314859370f1ee84afb... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-07-27 (Wed, 27 Jul 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/resolvers/galaxy_packages.py M lib/galaxy/tools/deps/resolvers/tool_shed_packages.py M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py Log Message: ----------- Address @nsoranzo's review Commit: 924a913630f395e26b662171a5075090470b2388 https://github.com/galaxyproject/galaxy/commit/924a913630f395e26b662171a5075... Author: John Chilton <jmchilton@gmail.com> Date: 2016-07-27 (Wed, 27 Jul 2016) Changed paths: M templates/admin/tool_shed_repository/common.mako Log Message: ----------- Mark conda install beta and move after TS options. Commit: 88fac719de191cad6896edb8ac6fcd3058a1accb https://github.com/galaxyproject/galaxy/commit/88fac719de191cad6896edb8ac6fc... Author: John Chilton <jmchilton@gmail.com> Date: 2016-07-27 (Wed, 27 Jul 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/resolvers/galaxy_packages.py M lib/galaxy/tools/deps/resolvers/tool_shed_packages.py M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py Log Message: ----------- Merge remote-tracking branch 'bxlab/install_via_conda' into install_via_conda Commit: 12209ab634634eb8c8a566512dc43b0d9ba78255 https://github.com/galaxyproject/galaxy/commit/12209ab634634eb8c8a566512dc43... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-07-27 (Wed, 27 Jul 2016) Changed paths: M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako Log Message: ----------- Merge pull request #56 from jmchilton/install_via_conda UI Tweaks Commit: a731ce2e22254d086452fc84eca15e65b444762d https://github.com/galaxyproject/galaxy/commit/a731ce2e22254d086452fc84eca15... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2016-07-27 (Wed, 27 Jul 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/brewed_tool_shed_packages.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/resolvers/galaxy_packages.py M lib/galaxy/tools/deps/resolvers/homebrew.py M lib/galaxy/tools/deps/resolvers/modules.py M lib/galaxy/tools/deps/resolvers/resolver_mixins.py M lib/galaxy/tools/deps/resolvers/tool_shed_packages.py M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py M lib/galaxy/tools/deps/views.py A lib/galaxy/tools/toolbox/requirements.py M lib/galaxy/webapps/galaxy/api/tool_dependencies.py M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/galaxy_install/repair_repository_manager.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py M lib/tool_shed/util/shed_util_common.py M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/manage_repository.mako M templates/admin/tool_shed_repository/preview_repository.mako M templates/admin/tool_shed_repository/reselect_tool_panel_section.mako M templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako M templates/webapps/tool_shed/repository/common.mako M templates/webapps/tool_shed/repository/export_repository.mako A test/integration/test_resolvers.py M test/shed_functional/base/twilltestcase.py Log Message: ----------- Merge pull request #2554 from bxlab/install_via_conda Fix bugs in post. Compare: https://github.com/galaxyproject/galaxy/compare/64f4d2192745...a731ce2e2225