Commit Graph
14432 Commits
Author SHA1 Message Date
Dave Bouvier ffbf0c3963 Find and add tool help images to the tarball. Delete any temporary files that were generated. 2014-08-29 15:21:30 -04:00
Dave Bouvier e14fad2db7 Merge with -central tip. 2014-08-28 14:44:29 -04:00
Dave Bouvier 73113b826c Add externally referenced files to the tool tarball. Code cleanup and error checking. 2014-08-28 14:43:55 -04:00
Aysam Guerler 5980c1e467 ToolForm: Enables hierarchical references and conversion of the tool form into a json/xml tree structure 2014-08-28 14:03:35 -04:00
Dave Bouvier 985f04a019 Merge tip. 2014-08-28 12:39:12 -04:00
Carl Eberhard 17a6595b5c Fix: remove 'jquery.event.drag.js' from base_panels.mako; Paired collection creator: allow single/multiple pairs to be re-ordered by drag and drop 2014-08-28 12:19:16 -04:00
Nate Coraor e24df033be Merge stable. 2014-08-28 11:35:36 -04:00
Martin Cech 5f9a741889 library permissions API - check whether payload is present in the kwd and throw exception if it is not, also bugfix 2014-08-28 11:01:32 -04:00
Martin Cech 3446cda5b6 no need to expose the method through API anymore 2014-08-28 10:57:30 -04:00
Martin Cech 3c5d4734ee allowing backward compatibility on setting library permissions API as per John's suggestion 2014-08-28 10:54:13 -04:00
Nicola Soranzo 09f1589ea4 Fix SQlite datatype sniffing for old sqlite3. Remove unused imports.
Bug fixed: when uploading a gzipped FASTQ file through upload1 tool on a
machine with SQLite 3.3.6, it was detected as 'sqlite' datatype and not
decompressed.

In fact, the sqlite3 command 'pragma schema_version' on any file returns
without error on this SQLite version.
2014-08-28 15:09:10 +02:00
Nicola Soranzo df44527af2 Fix SQlite datatype sniffing for old sqlite3. Remove unused imports.
Bug fixed: when uploading a gzipped FASTQ file through upload1 tool on a
machine with SQLite 3.3.6, it was detected as 'sqlite' datatype and not
decompressed.

In fact, the sqlite3 command 'pragma schema_version' on any file returns
without error on this SQLite version.
2014-08-28 15:09:10 +02:00
Carl Eberhard 0690b2b9f7 Fix to df2a994: remove debuggging statements 2014-08-28 09:49:00 -04:00
Carl Eberhard 7017833f42 Vis registry: add two tests (has_attribute, not_eq); add see also for test types in visualization.dtd; correct applicability tests for trackster and circster using not_eq on datatype.track_type 2014-08-28 09:44:56 -04:00
Nate Coraor bfb4688213 Update tag latest_2014.08.11 for changeset 109b170188e9 2014-08-28 09:00:13 -04:00
John Chilton 7543a567f2 Add workflow test demonstrating failure when multiple lists with different identifiers are using in workflows. 2014-08-27 16:32:26 -04:00
John Chilton 9b4ca59ff2 Remove workflow test that accidently depended on tool not in -central.
Opps.
2014-08-27 16:32:26 -04:00
John Chilton 401fad5e25 Add some more basic test tools for building simple workflows for testing. 2014-08-27 16:32:26 -04:00
John Chilton 565580a564 Update readme for functional test tools directory. 2014-08-27 16:32:26 -04:00
Dave Bouvier cf419552da Add feature to download a tarball containing tool XML, tool wrapper script, test inputs and outputs, and tool data table definitions + sample .loc file. 2014-08-27 14:55:43 -04:00
Carl Eberhard fb5a6afa97 UI, Paired collection creator: fixes and refactoring, allow pairs to be selected 2014-08-27 14:47:54 -04:00
John Chilton d26617f1bc Fix using multiple list collections with different identifiers in workflows.
Tools will pair off (or triplize, quadraplate, quintukify, etc...) based only on the index of the elements in the collection (so any N element list can be used in the same tool execution as any other N element list). Originally, I had decided to require the element identifiers to be the same in both collections (allows mixing a matching fewer collections in tools - but probably less likely to mismatch in a way the user did not intend). At any rate - I changed that decision and updated tool execution appropriately but not every aspect workflow collection 'pairing' - this fixes that and closes out this card https://trello.com/c/m5PiF1lR.

In very partical terms tools would ideally be consuming collection pairs - but for those that are still consuming two separate files (i.e. all of them) one can use two lists of datasets with pairs at matching indices and feed them into these tools - for workflows this doesn't work without this patch unless the identifiers and the indices match on these collections.

Thanks for Michael Crusoe and takadonet for the bug reports.
2014-08-27 14:39:43 -04:00
Martin Cech 70260e4215 initial implementation of library folder manager 2014-08-27 13:26:36 -04:00
John Chilton faee0075ef Fix upload tool for 6cb895d.
Web form (at least for older style upload tool) was passing in '' and the UUID custom datatype treats this as an invalid UUID (probably correct) instead of a None. This changeset fixes that by ensuring these values coming in through the controllers are transformed into None-s.
2014-08-27 13:06:26 -04:00
John Chilton b652af3e5b Reduce workflow step state and module population duplication.
Move all operations prior to workflow invocation (and a few other places state and modules are used) relating to populating the non-persistent attributes of `WorkflowStep`s (e.g. module, state, upgrade_messages, and input_connections_by_name) into a single function on a new class.

This should fix a couple of small errors as well - input_connections_by_name was being mis-calculated in a few places (though potentially never used down those roads) and some error handling code in the workflow editor template was expecting step.module to be populated with something (even if None) and it was not always.
2014-08-27 10:49:15 -04:00
Carl Eberhard 0baf3bfee3 UI, Paired collection creator: refactoring of paired HTML and fixes to draggable partition, add brush selection to unpaired 2014-08-26 16:30:46 -04:00
Carl Eberhard da5513f038 (add packed scripts) 2014-08-26 12:59:59 -04:00
Carl Eberhard 8a9b24dcd4 UI, Dataset choice control: add DatasetChoiceModal for choosing single or multiple datasets, add DatasetChoice and MultiDatasetChoice for displaying and activating selection modal from within a page; correct lookup of galaxy_config in dataset-model; add ListPanel for displaying collections of ListViews; add DatasetListPanel for displaying collections of generic datasets; add default no-op localizer (_l) to ui.js until that file is AMD; factor out icon-btn.less from history.less; remove make_popup_menus in default expandable behaviors 2014-08-26 12:59:15 -04:00
Dannon Baker 4c69734c3f Merged in kellrott/galaxy-farm/workflow-uuid (pull request #471)
Workflow UUIDs
2014-08-26 11:26:31 -04:00
Dannon Baker d4e2f8b404 Merge. 2014-08-26 10:48:35 -04:00
Dannon Baker 600cdc5b8f Clarify wording, explain cutoff. Add headers to better segment the page and prevent confusion between the two grids. 2014-08-26 10:48:12 -04:00
Dannon Baker 1fcd11d55f Fix (old) bug causing Jobs grid to display even when there were no jobs to show in it. Issue was 'jobs' (and the new recent_jobs) was actually a Query object and not an empty list of results, causing 'if jobs' to evaluate True regardless of whether or not there were jobs. 2014-08-26 10:34:31 -04:00
Dannon Baker 0ed6b9f4ee Remove extra p tag from jobs admin. 2014-08-26 10:28:38 -04:00
Dannon Baker a8d95b5a04 Merge 'recent jobs' view from PR466/467. Work in progress. 2014-08-26 10:28:00 -04:00
John Chilton 923bf2d32f Couple simple refactors making it slightly cleaner to create new module types.
Also slightly reduces shared logic galaxy.workflow.run.
2014-08-26 10:02:49 -04:00
John Chilton 4dcfe4c561 Some very basic unit tests and docs for workflow modules.
Just a start - I need to keep going with this and test and document all methods.
2014-08-26 10:02:49 -04:00
John Chilton 61d060729d Doc spelling fix in lib/galaxy/workflow/run.py. 2014-08-26 10:02:49 -04:00
Nate Coraor 29d4052667 Update tag latest_2014.08.11 for changeset 9a4b43021fd1 2014-08-26 09:00:14 -04:00
John Chilton 62f0d9da61 Merge latest stable. 2014-08-25 15:35:45 -04:00
John Chilton d0f6c6dcf3 Bugfix for 0750859: Don't generate duplicate workflow slugs for private workflows.
See full conversation on https://bitbucket.org/galaxy/galaxy-central/commits/07508592cb65845474b9f3e0f781260c.

Would like to better and allow slugs of deleted items to be reused - they cannot be for workflows for instance. Because the slugs are not really handled uniformly though - pages do not have this problem and deleted pages can have their slugs reused because this is included in a check in the web controller which directly assigns valid slugs at that point. Slugs for deleted histories cannot be re-used - but they couldn't be prior to this commit - so this isn't making things worse in that respect.
2014-08-25 12:36:34 -04:00
Aysam Guerler 6173935263 ToolForm: Add repeat blocks, refactor conditionals, fix styles, pack scripts 2014-08-25 12:27:18 -04:00
Dannon Baker 01ad5ea0f0 Merged in kellrott/galaxy-farm/upload_uuid (pull request #463)
Enabling UUID in file upload
2014-08-25 09:28:26 -04:00
John Chilton 0b43aa3847 Improvements to API import/export test case.
Actually do some verification of imported history, eliminiate use of deprecated mixin, timeout operations that 'wait', break up big function and name test better.
2014-08-24 19:37:33 -04:00
Nate Coraor b2460e62d8 Update tag latest_2014.08.11 for changeset 7e22f3579852 2014-08-22 09:00:42 -04:00
Daniel Blankenberg 170e092a84 Fix for FASTQ datasets peek/display of sequence counts. 2014-08-21 15:52:35 -04:00
Aysam Guerler 707f180cdc ToolForm: Implements conditionals 2014-08-22 14:32:07 -04:00
Daniel Blankenberg 8ba3b5c49e Fix for FASTQ datasets peek/display of sequence counts. 2014-08-21 15:52:35 -04:00
Nate Coraor 11db71afa9 Update tag latest_2014.08.11 for changeset 6445c0fe7612 2014-08-21 09:00:21 -04:00
Nate Coraor 19fba5b5f9 Set defaults for static so they do not need to be explicitly defined in the Galaxy config. 2014-08-20 17:51:49 -04:00
Nate Coraor b4d284bc56 Style fixes for sample universe_wsgi.ini 2014-08-20 17:51:33 -04:00