Commit Graph
13378 Commits
Author SHA1 Message Date
Daniel Blankenberg c86e36f652 Add the ability for Admins to reload tool data table entries from disk without restarting the Galaxy server. This does not look for new <table> entries or contained new <file>s within XML files, but will e.g. make any changes to a .loc file become live immediately without restart. 2014-05-13 13:01:47 -04:00
Daniel Blankenberg f5d2c1eb7d When viewing tool data table registry in admin interface, provide link to manage data table interface for each tool data table. 2014-05-13 12:35:35 -04:00
John Chilton 98a560ccd1 Optimize/correct LWR remote metadata generation for working directory outputs.
Previously I was attempting to mimic Galaxy's behavior of copying these files to a fixed output location after execution on the remote server before setting metadata. This was an un-needed copy since it appears to easier to just send the metadata generation code the expected path on the working directory.
2014-05-13 10:20:06 -05:00
John Chilton f8e904a81d Remove no longer valid log message. 2014-05-13 10:20:06 -05:00
John Chilton 3287af315d Ensure new_file_path exists before set_metadata.py generates metadata.
This directory is required to exist but usually unneeded because Galaxy creates this directory on startup. However, when setting metadata remotely with the LWR that remote Galaxy instance may have never been started and this directory may not exist.
2014-05-13 09:29:41 -05:00
John Chilton 122873624d Improvements to LWR documentation.
Add separate examples for MQ driven stuff - this should clear up things and make it clear which new parameters are required when using message queue and which are no longer required. Add more documentation for remote dependency resolution. Document rewrite_parameters.
2014-05-13 00:46:41 -05:00
John Chilton 0cad4c5581 Update LWR client through LWR changeset 9fb7fcb.
Among other smaller fixes, this update causes the LWR client/runner to pass more tool dependency context through to the remote LWR server when `dependency_resolution` is set to `remote`. This additional context allows tool shed packages to be resolved remotely (i.e. allows proper use of ToolShedPackageDependencyResolver on the remote LWR server).

It remains the responsibility of the deployer to ensure identical versions of tool shed packages are installed on the remote LWR server and the local Galaxy instance.
2014-05-13 00:13:02 -05:00
John Chilton 22bddab240 Implement serializable class that can describe full dependency context for remote dependency resolution.
Previously LWR jut serialized tool requirements, by transitioning to this class LWR should be able to resolve tool shed installed packages as well - requiring the additional repository and tool dependency context.
2014-05-13 00:13:02 -05:00
Dave Bouvier 8dbc18a56f Fix for retrieving job streams with the twill interactor. 2014-05-12 16:27:49 -04:00
Daniel Blankenberg 3a7f46cfff When working with <conversions> in DataToolParameters, have the parsed conv_types be a list, as is now expected in subsequent usage. 2014-05-12 15:27:36 -04:00
Martin Cech dd4170cf9e important docs for select2 backbone view 2014-05-12 14:56:06 -04:00
Greg Von Kuster 740a85c036 Fix typo in the Tool Shed's package recipe install step handler - thanks Bjoren Gruning. 2014-05-12 12:47:57 -04:00
John Chilton ec72618592 Small improvements to collection creation API.
Return full collection when creating collection and improved error handling during creation.
2014-05-12 09:54:02 -05:00
John Chilton fcae5f51ff Add API functional test for workflow extraction of collection reductions. 2014-05-11 13:56:49 -05:00
John Chilton 3109f70c3a Allow more typical expanded HDCA value with src when mapping over collection via API.
Flat ID still used by GUI - but when coming through API this is probably the better choice.
2014-05-11 13:56:49 -05:00
Jeremy Goecks e252d6283d Add example configuration for CLI Slurm runner. 2014-05-09 16:20:33 -04:00
Jeremy Goecks 383255e2dd Add a CLI-driven Slurm runner so that Galaxy can be run on non-submit hosts with a Slurm cluster. Add some flexibility for obtaining the external job ID in the CLI runner as well. 2014-05-09 16:15:27 -04:00
Dave Bouvier 430f568989 Fix functional test dataset error reporting. 2014-05-09 12:35:23 -04:00
Dave Bouvier f4386d60ab Clean up twilltestcase.py, fix functional tests for tools with spaces in the tool ID. 2014-05-09 09:57:26 -04:00
Aysam Guerler 0f6a9b7e67 Charts: Pack scripts 2014-05-09 07:58:26 -04:00
Aysam Guerler eefa752072 Charts: Improve job handling and heatmaps 2014-05-09 01:09:54 -04:00
Martin Cech 3fb515224b pep 8, fixed decoding of folders again 2014-05-08 18:55:57 -04:00
John Chilton 6d0de9ba11 Bugfix: (For bf60fa7) Only initial mapping steps in map reduce workflows were being connected correctly.
With expanded test case that checks such a connection. This takes care of of subsequent connections by iteratively updating hid_to_output_pair correctly (... I think, test works with at least two).
2014-05-08 16:12:07 -05:00
John Chilton b684f4a13e Add simple collection mapping workflow extraction functional test. 2014-05-08 16:12:07 -05:00
John Chilton aafe817cbf Refactor API assertions for reuse outside explicit TestCase classes. 2014-05-08 16:12:07 -05:00
John Chilton 203dfe9903 Reduce polling frequency of API tests, seems to help prevent sqlite locks. 2014-05-08 16:12:07 -05:00
John Chilton 5a098e81ac Doc fix in Galaxy's tool shed repositories API. 2014-05-08 16:12:07 -05:00
Dannon Baker 894c4a73e9 Update authenticate/baseauth doc with sample usage. 2014-05-08 11:47:24 -04:00
Dannon Baker 55bb17a234 Added the ability for /api/authenticate/baseauth to create an API key for a user if one is not set. Misc cleanup, using mappings instead of raw queries. 2014-05-08 11:33:55 -04:00
John Chilton a86d2e9729 Add some documentation to job_conf.xml.sample_advanced about LWR caching. 2014-05-08 09:14:24 -05:00
Martin Cech ab74f2d3f6 data libraries: introduced three visible share states for datasets in libraries private(only the current users private role has access)/restricted(not private and not non-restricted)/non-restricted(there is not a single role in the access set of roles)
also callback on modal hide() to call router and modify URL, some other minor fixes, pep8
2014-05-07 16:51:36 -04:00
Martin Cech 4eb84b85b3 pep8 2014-05-07 16:48:34 -04:00
John Chilton 2f8970a6a7 Bugfix: Rework collection matching logic so it properly matches combined collection/subcollection mapping.
With functional test to verify it works end-to-end with tool execution and unit tests to verify different kinds of collection combinations.
2014-05-07 15:39:03 -05:00
John Chilton 7ad72439ce Bugfix: Don't require matching identifiers to match up collections.
I changed this in some other places in the code before committing but this part stayed broken. Collections will match on order, type, and number of elements (pushing the problem to UI) - element identifiers can be different but will be preserved when possible.
2014-05-07 15:39:03 -05:00
John Chilton 3688e02475 Add framework test tool that has both data and data_collection param - with test case.
Tool test is mildly useful to verify this works for single execution - but more useful as basis for future changesets testing mixed collection and subcollection mapping tool executions.
2014-05-07 15:39:03 -05:00
Martin Cech f721037728 pep8 fixes 2014-05-07 15:31:03 -04:00
Martin Cech aeae79570b hunted down bug in streamball implementation that prevented adding files to archive if the filecheck was on and it passed 2014-05-07 15:27:37 -04:00
Martin Cech e0dd790f91 packed versions of John's JS code from dataset collections 2014-05-07 14:29:04 -04:00
Martin Cech 4ad5b570a1 allow JS modal to execute callbacks on hide() 2014-05-07 14:23:15 -04:00
Martin Cech 0e2be0f1c1 data libraries: API pep8, cleanup, repaired yet another encoding bug 2014-05-07 14:10:30 -04:00
John Chilton b0e3dbe304 Merged in jmchilton/galaxy-central-fork-1 (pull request #385)
CLI Job Runner Enhancements
2014-05-07 11:57:21 -05:00
John Chilton 42a26f4ece Re-update documentation for fixes in a44bea8. 2014-05-07 11:49:59 -05:00
John Chilton 44a0c0deea Merge pull request #383. 2014-05-07 11:43:03 -05:00
John Chilton 6a4c14e6d2 Simpler, more powerful subcollection mapping.
Collections can be mapped over 'data' parameters and sufficiently nested collections can be mapped over 'data_collection' parameters (for instance a list of 5 pairs can be supplied to a tool taking in a pair and 5 jobs will be executed). I (perhaps poorly) term these concepts collection mapping and subcollection mapping.

Prior to this changeset - the API for doing collection 'mapping' and 'subcollection mapping' was somewhat more divergent and the tool execution code explicitly forbid doing both kinds of mappings in the same tool execution even if the effective collections could be matched (e.g. it could not map a 'data' parameter over a list of 5 datasets and a pair parameter a list of 5 pairs in the same execution).

This changeset should remedy this - as long as the effective collection mappings can match up such jobs should be possible. The workflow editor (and I think runner) already thought this was possible, so this changeset reduces the tool-workflow impedance mismatch - an existing problem exacerbated by recent dataset collections introduction.

This all needs much more testing - test workflows execute this way, functional test of a tool execution that combines collection mapping and subcollection mapping, etc....
2014-05-07 11:29:51 -05:00
Dannon Baker 8a2a495781 Merge. 2014-05-07 11:49:14 -04:00
Dannon Baker ef09b7c4ba Merge stable. 2014-05-07 11:48:11 -04:00
Martin Cech e053743ca7 pep8 fixes 2014-05-07 11:47:28 -04:00
Dannon Baker 6fd4dba541 Force an absolute path for the temp directory in the local runner 2014-05-07 09:45:53 -04:00
Dannon Baker 2432115abb Force an absolute path for the temp directory in the local runner 2014-05-07 09:45:53 -04:00
Greg Von Kuster 96f2e27f0b Fix type introduced in renaming the InstallManager to the ToolMigrationManager - thanks Nicola Soranzo. 2014-05-07 06:42:28 -04:00