Commit Graph
14485 Commits
Author SHA1 Message Date
Aysam Guerler 5f7aff8553 ToolForm: Adjustments and refactoring 2014-09-03 15:30:50 -04:00
John Chilton c955e41867 Fill out tool test for configured discovered datasets.
Add new example based on Anton's bamtools split work and label all the outputs as visible - this should likely be the default but until it is might as well demonstrate them as visible since that is how they are most useful.
2014-09-03 15:17:49 -04:00
Martin Cech 7bed0aa4d6 small bugfix and new method in folder manager 2014-09-03 11:14:42 -04:00
Carl Eberhard b7ce7fdab0 Visualizations registry: in universe_wsgi.ini, set default value of visualization_plugins_directory to config/plugins/visualizations 2014-09-03 09:30:27 -04:00
John Chilton 4c572245e6 Fix workflow rendering unit test when run in suite.
It was stubbing out connection stuff which worked fine when running test on its own - but after any test sets up the sql alchemy mappings this breaks down because events are trying to fire. This just uses actual model classes - which is just as easy anyway really.
2014-09-03 08:43:25 -04:00
John Chilton e1c0d419fd Delete incorrect unit test added in d15f9a1.
Don't know what I was thinking - it doesn't look like that method ever had that behavior.
2014-09-03 08:43:25 -04:00
John Chilton c87002961f Fix unit tests broken with 9f63d96. 2014-09-03 08:43:25 -04:00
John Chilton 31187ddb6d Refactor some collection-y tool methods ahead of collection outputs.
Tool mapping "structure" logic no longer assumes tool outputs are datasets - could also potentially handle logic related to structure of output collections as well now.

These variable names will make for sense down the road when tools that explicitly create collections exist and can be mapped over.
2014-09-03 08:43:25 -04:00
John Chilton fcb552bc85 Small optimization for implicit collection creation from tool execution.
Don't write out encode identifier, add to dict, and then reload object in dataset collection service - just pass through the object in the dictionary as is.
2014-09-03 08:43:25 -04:00
John Chilton f75a932c3a Break up tool action loop by refactoring filtering logic out. 2014-09-03 08:43:25 -04:00
John Chilton d8457bb7ee Unit tests for tool action code determining output formats.
With refactoring to reduce cyclomatic complexity. Also renaming 'input_ext' what it actually is 'random_input_ext'. We should fix that or at least issue a huge warning if we detect 'input' could have reasonable been different things.
2014-09-03 08:43:25 -04:00
John Chilton c27a7b0904 Refactor tool action loop allowing reuse of job dataset creation logic.
Reusing this logic will be useful in the context of creating datasets belonging to output collections. This also breaks up the big loop slightly and allows a small reduction in cyclomatic complexity in subsequent refactoring.
2014-09-03 08:43:25 -04:00
John Chilton 5aa210a388 Small galaxy.tools.actions refactor related to object store...
Breaks up the big loop in execute a little bit but will enable a much bigger breakup in subsequent refactoring because the loop will no longer have to update the object_store_id local variable - that will be tracked in new object.
2014-09-03 08:43:25 -04:00
John Chilton 6515dc274d Unit test for galaxy.tools.action to ensure all datasets get same object store id.
Enables subsequent refactoring.
2014-09-03 08:43:25 -04:00
John Chilton c0b4738fa8 PEP-8 fixes for tools/actions/__init__.py. 2014-09-03 08:43:25 -04:00
John Chilton c1ee4c9b31 Add functional test tool demonstrating output filters.
Add new 'expect_num_outputs' attribute to 'test' element in tool XML to verify the produced number - needed to test output filtering.
2014-09-03 08:43:25 -04:00
John Chilton fcce8b8218 Add functional test tool demonstrating setting output dataset formats.
Directly setting format attribute, setting to format to 'input' (ambigious, non-deterministic and should be deprecated IMO), using format_source, and using change_format actions.
2014-09-03 08:43:25 -04:00
John Chilton db07824a12 Add functional test tool demonstrating special parameters.
:(
2014-09-03 08:43:25 -04:00
John Chilton ef1877b468 Small tweaks to some functional test tools.
Add data labels so the tools works in the workflow editor and added a conditional switches to some with collection params and multiple input data parameters to test some state-y logic in workflow editor.
2014-09-03 08:43:25 -04:00
John Chilton 6d727ce454 Merge stable. 2014-09-02 16:41:48 -04:00
Dave Bouvier 7ec4f1051f Remove call to send_control_task that should not have been added to admin.package_tool in the first place. 2014-09-02 16:05:45 -04:00
Aysam Guerler 7dfb30354e ToolForm: Add sliders, radio buttons for boolean and integer fields, Ui: Update frames 2014-09-02 16:06:35 -04:00
Martin Cech 49560155dc missing import 2014-09-02 15:46:24 -04:00
Carl Eberhard a96e50b9a3 Test fixes for 5ce55f9; correct spaceghost.stderr to use system.stderr (thanks, John); correct api-workflow-tests (which I completely forgot *I* had made) and add test-data 2014-09-02 15:35:56 -04:00
Nate Coraor 824f66e080 Make it possible to load dynamic job runner rules from somewhere other than galaxy.jobs.rules. 2014-09-02 15:30:57 -04:00
Carl Eberhard cabe8ed425 History API: remove set_as_current, api/histories/current, and POST api/histories with current == True (create new current history), replace with controllers/history/set_as_current, current_history_json, and create_new_current (respectively) - all returning json; add exceptions.DeprecatedMethod; pack scripts 2014-09-02 13:26:47 -04:00
Daniel Blankenberg 8ccf8287b4 Quote commandline arguments for extract genomic DNA tool. 2014-09-02 13:15:17 -04:00
Daniel Blankenberg f20731c466 Fix for custom dbkeys when chrom count dataset has been deleted. 2014-09-02 12:50:37 -04:00
John Chilton e7b0801f8d Small improvements to JavaScript testing with run_tests.sh.
Add new -j|--casperjs option to run through the casperjs test suite. Ensure grunt is on path before attempting to run qunit tests. A more useful version of this changeset which automatically installed phantomjs, casperjs, grunt, and npm as needed and added the required tools to the tester's path (https://bitbucket.org/jmchilton/galaxy-central-fork-1/commits/0919fc9403933f88e458724b95b0d213117bbd0e) proved unpopular because of implementation details - see conversation here https://bitbucket.org/galaxy/galaxy-central/pull-request/461/remove-deprecated-test-scripts-improved/diff.
2014-09-02 12:35:33 -04:00
John Chilton 8fb1a04b8e Fixup comments and add README for test/casperjs directory. 2014-09-02 11:50:43 -04:00
John Chilton b0c378bea4 Remove deprecated test running scripts.
- run_functional_tests.sh can be replaced with the backward compatible run_tests.sh.
 - run_unit_tests.sh can be replaced with `run_tests.sh --unit` (or just -u)
 - run_tool_shed_functional_tests.sh can be replaced with `./run_tests.sh -toolshed` (or just -t).

In each case run_tests.sh provides better documentation and superior argument parsing.
2014-09-02 11:50:43 -04:00
John Chilton 9978e26dce Pack scripts. 2014-09-02 11:21:08 -04:00
John Chilton 24e914f57b Fix workflow editor bug related state updates for collections attached to multiple input data parameters.
Detail bug report from Michael Crusoe here : https://trello.com/c/0mdGCx4P.

This also fixes a test case added in 289e48b which was both attempting to assert something wrong and was incorrectly implemented. Augmenting the workflow editor test suite with some actually valid test cases that assert the correct behaviors.

For a longer explaination - workflow input terminals have two related concepts 'canAccept' and 'attachable'. An output terminal is 'attachable' if in the abstract it could be attached to the input regardless of whether the input is already filled or not. 'canAccept' is more stateful in that an output terminal is 'canAccept'able if the input terminal is not filled ('_inputFilled') and it is 'attachable'.

So - the problem was 'attachable' was not correctly defined for a multiple input data parameters. 'attachable' was asserting that any connected input terminal could not be 'attachable' by an collection output terminal - so on these asynchronous node state changes collections attached to multiple input data parameters were being wiped out. The more percise/correct distinction is that if a multiple input data parameter has single inputs connected to it - it cannot also have a collection connected to it (yet anyway). This fixes the mentioned bug.

The problematic test case was conflating 'attachable' and 'canAccept'able - I have fixed the test case to verify the correct 'attachable' logic and added newer, higher level test cases to test the canAccept logic and the actual behavior the end user would observe (of the connector being destroy).
2014-09-02 11:20:44 -04:00
Martin Cech f1ab7e05e8 next chunk of API managers - libs, folders, roles 2014-09-02 10:37:14 -04:00
Dannon Baker fd53ed075d Pack scripts. 2014-09-02 09:29:50 -04:00
John Chilton e8b7272aa8 Merge latest stable changes. 2014-09-02 08:54:56 -04:00
Jeremy Goecks 0c75a102d0 HDA/LDDA models: synchronize them with 'data_type' and 'file_ext', properly fill data_type with Galaxy data types, and use file_ext in place of data_type throughput client code. 2014-08-29 17:17:44 -04:00
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 277d563e06 Merge with -central. 2014-08-29 15:22:08 -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
Nate Coraor 7a5fed6208 Update tag latest_2014.08.11 for changeset ea12550fbc34 2014-08-29 14:00:23 -04:00
Carl Eberhard b8b1c4e36f History contents: allow copying accessible datasets into this history 2014-08-29 10:43:51 -04:00
Dannon Baker d3a50e2923 Merged in jmchilton/galaxy-central-fork-1/stable (pull request #479)
[STABLE] More collection-y workflow fixes.
2014-08-29 09:44:47 -04:00
Nate Coraor d7b218b6ff Update tag latest_2014.08.11 for changeset 0047ee06fef0 2014-08-29 09:00:25 -04:00
John Chilton b78d059f4c Pack scripts. 2014-08-29 00:31:59 -04:00
John Chilton 2641d8e552 Don't persist literal string '<DummyDataset...>' when updating tool state in workflow editor.
Doesn't seem to actually break the workflows because Galaxy tries to assign the value to the parameter afterward - fails and assigns it to None anyway and then connects up everything - but it does cause the workflow editor to pop-up an annoying warning about this value change.
2014-08-29 00:30:30 -04:00
John Chilton d80d1b1a8f Fix for at workflow editor glitch. 2014-08-29 00:30:30 -04:00
John Chilton 0aef022bb0 Merged in dannon/galaxy-central-prmaker/stable (pull request #478)
[STABLE] Remove option for the (long since deprecated in favor of Data Managers) data_admin interface from admin
2014-08-29 00:27:45 -04:00
Dannon Baker 284edd5d62 Merge. 2014-08-28 17:21:42 -04:00
Dannon Baker facac09e2e Remove option for the (long since deprecated in favor of Data Managers) data_admin interface from admin 2014-08-28 17:21:03 -04:00