Commit Graph
6756 Commits
Author SHA1 Message Date
Carl Eberhard 4b2b3af5ce (Fix to 8e4196a) Histories embedded in pages: first pass at using panel 2014-02-20 17:44:04 -05:00
Dave Bouvier 3d807b3b73 Merged in davebgx/galaxy-central/central-eliminate-fabric (pull request #330)
Eliminate use of fabric when executing tool dependency recipes' shell_command actions.
2014-02-20 16:27:11 -05:00
Dave Bouvier ac2d39eb90 Use the provided use_fabric parameter in handle_command. 2014-02-20 16:00:21 -05:00
Dave Bouvier db55ca3bc2 Code cleanup, documentation. 2014-02-20 15:45:42 -05:00
Daniel Blankenberg 2849660333 Fix for ToolEvaluator with optional Dataset Input selected with multiple inputs. 2014-02-20 11:52:52 -05:00
Carl Eberhard 2a28ef005a History published/shared/display as slug: use annotated-history-panel, search open by default, preserve whitespace in annotations, replace import button with 'switch to' if owned by user viewing; Annotated History Panel: panel view of history that shows datasets as a table with additional dataset info in a left cell 2014-02-20 11:34:19 -05:00
Daniel Blankenberg 42bd248b93 Rework logic for setting selection of DataToolParameter. Fixes issue seen with rerun where incorrect options were selected. 2014-02-20 11:31:07 -05:00
Greg Von Kuster ea2f6b3d80 Merged in trevorw/galaxy-central-2/trevorw/specify-thirdparty-cookies-must-not-be-b-1392909850239 (pull request #326)
specify third-party cookies must not be blocked - repository.py
2014-02-20 11:14:38 -05:00
Daniel Blankenberg 994737422d Fix for ToolEvaluator with optional Dataset Input selected. 2014-02-20 11:07:16 -05:00
Trevor Wennblom 59c29d1f75 specify third-party cookies must not be blocked - repository.py
third-party cookies are normally (and hopefully) disabled for privacy
2014-02-20 15:27:57 +00:00
John Chilton 214d1f89bb Update LWR client through LWR changeset 51f097d.
Add RemoteTransferAction - to allow LWR server to stage files up and down by downloading/uploading them. Still need to augment Galaxy to support such an endpoint for job-related files.
2014-02-20 09:23:52 -06:00
Dave Bouvier 63adb743a2 Eliminate the use of fabric when executing commands defined in an <action type="shell_command"> tag. 2014-02-20 09:47:35 -05:00
Dave Bouvier 915cfe0cfc Merge with a89bbdfd4a71671d575d9a0a3a9f8abeba3f7b21 2014-02-19 16:34:22 -05:00
Dave Bouvier 23889efef6 Ensure that symlinks are moved before regular files, since this can in some cases causes a 'No such file or directory' error when the symlink target is moved before the symlink itself. 2014-02-19 16:34:01 -05:00
Daniel Blankenberg b60aba259e Fix for DatasetListWrapper with optional inputs. 2014-02-19 16:15:48 -05:00
Dave Bouvier 665099efa4 Situations where a migration warning would be incorrectly displayed, and tools with matching filenames would be removed from the tool_conf.xml after running a migration script. 2014-02-19 15:23:45 -05:00
Dave Bouvier 3da1ca8fec Fix for situation where duplicate database records would be created if a repository was uninstalled and reinstalled after getting updates from the tool shed. 2014-02-19 15:21:12 -05:00
Dannon Baker 7474579310 Swap amqplib for amqp. This was mostly a drop-in replacement, since it's a currently-maintained fork of amqplib, with slight updates to work with amqp 0-9-1. 2014-02-19 14:27:10 -05:00
Greg Von Kuster 19ab47d1a8 Make managing an in-memory registry of bi-directional installed repository dependency relationships a configurable option for Galaxy instances. 2014-02-19 13:05:25 -05:00
Greg Von Kuster dda9905cef Make managing an in-memory registry of bi-directional installed repository dependency relationships a configurable option for Galaxy instances. 2014-02-19 13:05:25 -05:00
Nate Coraor 4e5e7bd21e merge. 2014-02-19 12:02:12 -06:00
Nate Coraor 069c52523b merge. 2014-02-19 12:01:03 -06:00
Nate Coraor 8ecae313d8 Stop jobs when all output datasets are deleted via the API. 2014-02-19 12:00:33 -06:00
Carl Eberhard d54087d47a history/view: clean up, replace import link with window.location; UI mode button: several fixes, clean up, docs; Remove original_view from controllers/history (and templates) 2014-02-19 12:32:06 -05:00
Carl Eberhard 73e087c9a9 History panel: begin process of breaking up panel into more focused prototypes 2014-02-18 15:11:48 -05:00
Aysam Guerler 768376f960 Upload: Make upload available to anonymous users 2014-02-18 13:13:04 -05:00
Daniel Blankenberg 2dfad56905 Fix for deleting uploading HDAs. 2014-02-18 12:57:39 -05:00
John Chilton 4f69d131f9 Improvement to message queue driven LWR.
At high-level there are two core enhancements here - ability to kill message queue driven LWR jobs (though due to regressions in latest galaxy release there is not longer a way to initiate this from the GUI I don't think) and additional state transition (LWR+MQ jobs will now transition from queue to running properly, previously they just went from queue to complete).

A lot of other small changes to LWR client aimed at getting file size of lwr_client/client.py and lwr_client/manager.py under control - see LWR commit log for more details.

This updates the LWR client through LWR changeset 2d9f333.
2014-02-18 11:33:28 -06:00
John Chilton 9be66ef570 Random PEP-8 fixes to some api controllers. 2014-02-18 11:33:25 -06:00
Carl Eberhard cbdb99bf83 HDA model: allow copying the purged attribute; History model: allow copying all datasets (including purged); History imp: change query param flag 'include_deleted' to 'all_datasets', send to History model copy; history/view: incorporate 'all_datasets' flag in import button 2014-02-18 10:44:43 -05:00
John Chilton 5efad22c03 Fix for recent LWR message queue commit.
Was always trying to bind to message queue.
2014-02-18 06:32:08 -06:00
John Chilton c60d06ab22 Allow LWR runner to publish/consume messages via message queue.
To use LWR via message queue, ensure each such destination defines "default_file_action" as "remote_copy" and the LWR base staging directory pointed to by the  "jobs_directory" parameter. Finally add a "url" argument to LWR job runner plugin in job_conf.xml specifing the amqp URL to target (by default this will target the default ("_default_") LWR job manager - this can be overridden by specifing a "manager" attribute the plugin element in job_conf.xml).

Some of the implementation details here are bit hacky now to localize changes to LWR, once Dannon has merged his work - a new job runner base class or option should be implemented to account for this truely asynchronous job running implementation. (Comments inline about this.)

This updates the LWR client through LWR changeset 59ad1ea03448.
2014-02-17 21:26:49 -06:00
Carl Eberhard d30e035d82 Merge 2014-02-17 16:20:42 -05:00
Carl Eberhard 1ba20cc99c Fix to history view: include purged datasets in history list when bootstrapping (this prevents them being added later and out of order when an update occurs) 2014-02-17 16:20:21 -05:00
John Chilton 3d1d0d3e4a Update LWR client through LWR changeset 5c609be.
The LWR server and client can be driven via message queues, though this changeset doesn't update the LWR runner itself to allow this - only the client itself. The runner however has been updated to support some more minor changes that enabled the LWR client to be message queue driven.

In particular, a new action type was added "remote_copy" that does a file-system copy of files being staged in or out like "copy" - but it does so on the LWR side instead of the Galaxy client. In this scenario these actions are serialized and transferred with the "launch" command to the LWR - potentially eliminating many HTTP calls.

Paired with this, more processing can happen on the client side - namely calculating remote paths and properties - and if configured in this fashion the LWR "setup" step can be eliminated - allowing the LWR client to completely specify a job with a single one-directional message (very useful for message queues). While modifying the LWR to be able to behave in this fashion was done to enable message queues - a traditional HTTP driven LWR can use these features (remote copy, client-side path calculation, etc...) and job_conf.xml.sample_advanced has been updated to reflect this.

For more information on changes to the LWR client this encompasses see the following LWR changesets:

https://bitbucket.org/jmchilton/lwr/commits/bacaa5c840bbf41952fcafe6e0deadd306c868fa
https://bitbucket.org/jmchilton/lwr/commits/c8254d4525fa19f6761c6a75506d7b2bbdbced9e
https://bitbucket.org/jmchilton/lwr/commits/1f068927a677bbfb932c475e5a4dad9885c61071
https://bitbucket.org/jmchilton/lwr/commits/bde8cbe6f5736a82d5fa20b322cb34d9d4e8fbee
https://bitbucket.org/jmchilton/lwr/commits/993910fa0c5a0ac2be72b2d70eeaaa0767e18032
2014-02-17 14:17:43 -06:00
Martin Cech c2bed47d63 admin/users: show time created and activated status columns to help admins to manage users 2014-02-17 13:58:55 -05:00
Aysam Guerler 934db851e7 Datatypes: Add datatype description to xml, Upload: Load description from xml 2014-02-15 00:06:32 -05:00
Dave Bouvier 37ee5084e9 Merge bugfix from stable. 2014-02-14 16:00:00 -05:00
Dave Bouvier a2d05171bf Also check for tool config path when installing migrated tools and rewriting the tool_conf.xml. This resolves the issue described in pull request 324. 2014-02-14 15:59:35 -05:00
Carl Eberhard 3e82f95468 Visualizations registry: allow registry visualizations to be rendered properly when displayed by slugline; Scatterplot: use embedded to cue loading of display (w/o editor) 2014-02-14 13:58:30 -05:00
Carl Eberhard 8ec947ae13 Saved visualizations list: use vis-reg plugin display name for type column (if available) 2014-02-14 11:21:51 -05:00
Carl Eberhard ecf9b060c4 Remove scatterplot from legacy visualization framework (it will no longer appear if you haven't enabled visualization_plugins_directory in your universe_wsgi.ini); clean up; pack scripts 2014-02-14 10:47:38 -05:00
Greg Von Kuster f1bb67daee Change log.warning to log.debug for messages regarding conflicting datatypes since recent changes in the Galaxy framework now result in job errors when using log.warning. 2014-02-14 10:40:31 -05:00
Martin Cech 536d39a98d mobile.py edited online with Bitbucket 2014-02-13 19:30:10 +00:00
Aysam Guerler 2ed1631bec Merge 2014-02-13 11:27:25 -05:00
Aysam Guerler 28744b09d8 Reports: Fix time format in grids 2014-02-13 11:19:54 -05:00
Greg Von Kuster 7c0f58fecc Fixes for repositories in the tool shed whose repository tip changeset has no files (because they were all deleted) but have valid tools and other utilities in previous changeset revisions. 2014-02-12 10:17:38 -05:00
Greg Von Kuster 48f4f527dc Fixes for repositories in the tool shed whose repository tip changeset has no files (because they were all deleted) but have valid tools and other utilities in previous changeset revisions. 2014-02-12 10:17:38 -05:00
Greg Von Kuster 385e9e0d24 Change log.warning to log.debug for messages regarding conflicting datatypes since recent changes in the Galaxy framework now result in job errors when using log.warning. 2014-02-14 10:40:31 -05:00
John Chilton 3131a252ae Backout of 28d43f4.
Not quite ready for primetime.
2014-02-10 22:13:35 -06:00