Commit Graph
7783 Commits
Author SHA1 Message Date
Dave Bouvier db416f2a91 Correct path to original tool XML file in the event a temporary XML file had been generated. 2014-08-29 15:29:46 -04:00
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 73113b826c Add externally referenced files to the tool tarball. Code cleanup and error checking. 2014-08-28 14:43:55 -04:00
Dave Bouvier 985f04a019 Merge tip. 2014-08-28 12:39:12 -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
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
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
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 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 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
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
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
Daniel Blankenberg 170e092a84 Fix for FASTQ datasets peek/display of sequence counts. 2014-08-21 15:52:35 -04:00
Daniel Blankenberg 8ba3b5c49e Fix for FASTQ datasets peek/display of sequence counts. 2014-08-21 15:52:35 -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
Kyle Ellrott 8c0851d087 Fixing some small bugs to get the code to work 2014-08-20 14:27:56 -07:00
Kyle Ellrott 47f0f822f0 Refactoring work to add in Workflow UUIDs 2014-08-20 14:10:43 -07:00
Dannon Baker 930fe2fa61 Swap remote user logout to actually follow galaxy internal logout procedure and then redirect. Also fix logic for user dropdown -- it was preventing users from seeing stuff that was actually available before. 2014-08-20 12:55:32 -04:00
Dannon Baker 6f6ad216a9 Fix formatting in cloudlaunch. 2014-08-20 12:33:11 -04:00
Dannon Baker cbc7d0ea40 Update instance types, slim down the options to recommended types. This will (eventually) make it to a single shared resource in bioblend that's used in cloudman + galaxy, but this change gets us in sync for now. 2014-08-20 12:22:38 -04:00
Dannon Baker 2ecd1b988a Merged in dan/galaxy-central-prs/stable (pull request #470)
Fix for resetting installed toolshed repository metadata inside of Galaxy.
2014-08-20 11:03:06 -04:00
Daniel Blankenberg ed493034cc Fix for resetting installed toolshed repository metadata inside of Galaxy. 2014-08-20 10:48:48 -04:00
Daniel Blankenberg f3a74b6419 Fix for resetting installed toolshed repository metadata inside of Galaxy. 2014-08-20 10:48:48 -04:00
Dannon Baker 60ed47fb7a Clarify job lock log statement, swap loglevel from debug to info. 2014-08-20 10:31:01 -04:00
Dannon Baker 8bd8c141d8 Merge. 2014-08-20 09:49:00 -04:00
Dannon Baker 946dfb74ff Re-enable administrative job lock, works with multiple handler processes using the internal message queue 2014-08-20 09:48:19 -04:00
John Chilton 3d6f5f16e4 Attempt to ensure batch workflows are all properly assigned to same history.
... in case trans.get_history() changes during scheduling. I believe this was what was happening here (http://dev.list.galaxyproject.org/redirecting-to-unnamed-history-td4665414.html) though I have no proof - nonetheless this won't hurt anything.
2014-08-20 08:44:02 -04:00
Aysam Guerler d995301098 ToolForm: Add data selector, dynamic column selector and checkboxes, extends json content for basic parameters 2014-08-19 15:01:57 -04:00
Dannon Baker ec8d5dfec0 Merged in martenson/galaxy-central-marten (pull request #451)
UI + API for library, folder, library dataset and dataset permissions
2014-08-19 11:55:40 -04:00
James Johnson 3c82db9bd6 For _ensure_valid_session with use_remote_user set, when galaxy_session.user.email != remote_user_email invalidate the session UNLESS allowing user impersonation and the remote user is an admin. 2014-08-19 13:33:36 +00:00
James Johnson 38c91a0eca For _ensure_valid_session with use_remote_user set, when galaxy_session.user.email != remote_user_email invalidate the session UNLESS allowing user impersonation and the remote user is an admin. 2014-08-19 13:33:36 +00:00
Nate Coraor a48c6410dc Adjust resubmitted state in get_hda_dict rather than in multiple places further down. 2014-08-18 15:25:29 -04:00
Dannon Baker 5644f7396e Fix more typos in jobs/rule_helper.py, some new, some old. 2014-08-18 15:16:13 -04:00
Dannon Baker 1417d967f2 Merged in jmchilton/galaxy-central-fork-1 (pull request #465)
Dynamic destination enhancements aimed at enabling co-locating data and (cloud) bursting.
2014-08-18 15:05:18 -04:00
Dannon Baker 1fc4218681 Merged in kellrott/galaxy-farm/federation_ids (pull request #462)
UUIDs as valid inputs for workflows
2014-08-18 13:38:24 -04:00
John Chilton a5a13547cd Extract some mixin's out of trans allowing trans-like functionilty outside web threads...
In particular break out mixins defining context-based utilities for interacting with app, an user, and a history. In downstream work on workflow scheduling this proves nessecary and sufficient to create an context for 'execute'-ing tools (create jobs) outside of web threads in response to workflow requests.

Unit tests for some of this.
2014-08-18 10:28:40 -04:00