Commit Graph
1839 Commits
Author SHA1 Message Date
John Chilton 79bbc97a18 Attempt to fix transiently failing capsule TS test.
Guess here is that a flush is not occuring on that file because it is happening as part of garbage collection and not explictly as part of an explicit close.
2015-12-26 12:37:21 +00:00
John Chilton 7269f76e6e Remove transiently failing maxseconds.xml framework test. 2015-12-26 12:37:17 +00:00
Martin Cech ae2b94824a Merge pull request #1376 from jmchilton/py3_0
More Python 3 fixes.
2015-12-21 12:41:24 -05:00
John Chilton 36d9514e26 More Python 3 fixes.
This fixes all unit tests for code exclusively covering the stuff I'm moving into the galaxy-lib that will be used by planemo, pulsar, and future tooling efforts.
2015-12-20 13:38:34 +00:00
guerler 39e7f025eb Refine popover wrapper
Revise popover, add tests
2015-12-19 17:08:51 -05:00
guerler 048561d282 Avoid duplicate upload entries, revise modals, add tests
Revise styles

Add more tests
2015-12-19 17:08:49 -05:00
Björn Grüning 455372e6bf Merge pull request #1353 from jmchilton/output_refactor
Refactor tool output classes out of galaxy.tools and into parser module.
2015-12-18 00:19:22 +01:00
Aysam Guerler 41da9b0f88 Merge pull request #1306 from common-workflow-language/subworkflows
New Workflow Modules - Input Parameters and Subworkflows
2015-12-17 09:47:29 -05:00
John Chilton 61f64e8285 Refactor tool output classes out of galaxy.tools and into parser module.
This makes the galaxy.tool.parser much more portable, it no longer has a dependency on anything in galaxy.tools or submodules except galaxy.tools.loader (which in turn has no dependencies on galaxy.tools or submodules).
2015-12-16 22:07:21 +00:00
John Chilton fc85857a71 Separate abstractions for parsing discovered datasets and discovering.
This is part of a long effort to build a galaxy.tools.parser module that has no dependencies outside of say galaxy.util - so I can add it to the code shared with planemo and pulsar. This would allow planemo (and by extension Tool Shed 2.0) to reason about tools in an abstract way without the billion dependencies of galxaxy.tools.Tool.
2015-12-16 16:21:08 +00:00
John Chilton 530ceb13be Fix for failing qunit test. 2015-12-16 15:43:22 +00:00
John Chilton 157939aa8f Implement nested workflows.
Details:

 - Add a new workflow module describing subworkflows.
 - Add workflow list to editor side panel - with options to link in a subworkflow module or copy the target workflow into the workflow being editted node for node.
 - Update workflow, workflow step, and workflow invocation models to track subworkflow connections and execution.
 - Extend workflow outputs with concepts of labels (and UUIDs while I'm there) to match workflow inputs. This allow us to have something to label outputs with in the workflow editor and to reference in the format 2 workflow description language.
 - Extend workflow editor UI to allow labeling workflow outputs (and enforce that these are unique across a workflow).
 - Extend workflow invocation and progress tracking to allow invoking a subworkflow as part of another workflow invocation.
 - Extend workflow import and export code to allow a nested representation of workflows.
 - Update format 2 workflow description to allow testing nested workflows.

Most relevant new and modified test cases can be run using the following commands:

```
./run_tests.sh -api test/api/test_workflows.py:WorkflowsApiTestCase.test_run_subworkflow_simple
./run_tests.sh -api test/api/test_workflows_from_yaml.py:WorkflowsFromYamlApiTestCase.test_subworkflow_simple
./run_tests.sh -api test/api/test_workflows_from_yaml.py:WorkflowsFromYamlApiTestCase.test_outputs
nosetests test/unit/test_galaxy_mapping.py
nosetests test/unit/workflows/test_workflow_progress.py
```
2015-12-16 15:22:18 +00:00
John Chilton 45962f3234 Input parameter workflow module (experimental).
- Implement a input parameter module that mirrors data and collection input modules but has a type that can currently be one of text, integer, float, color, and boolean.
 - Allow connections between these and tool step inputs.
 - Extend model to support this.
 - Add new input types for format 2 workflow definitions for various types that all map to this kind of step. Typed inputs such as this match well with CWL workflow inputs.

Someday I imagine these will be superior to just marking a tool input "Specify at Runtime" for all the same reasons input steps are superior to leaving inputs unattached.
2015-12-16 15:22:18 +00:00
Dannon Baker cf5d209e0f Manual merge of #1303 to resolve build artifact conflicts. 2015-12-16 06:51:12 -05:00
carlfeberhard 86632afdd3 Merge pull request #1316 from jmchilton/remove_casper_api_tests
Remove worklfow casperjs API test.
2015-12-15 09:32:19 -05:00
John Chilton 886f6d2d70 Improved validation of tools during workflow execution.
Do a more complete validation of everything after workflow parameters have been replaced and inputs connected up.

Attempt 2 at the idea in https://github.com/galaxyproject/galaxy/pull/1284.
2015-12-14 15:29:35 +00:00
John Chilton 58911edbfb Remove worklfow casperjs API test.
It has good and more updated coverage in the Python API testing framework.
2015-12-14 14:05:43 +00:00
John Chilton 6580d51293 Merge pull request #1296 from pvanheus/env-modules-resolve
Documentation for dependency resolvers
2015-12-11 15:00:19 -05:00
carlfeberhard 84f3b72e1a (merge dev); Testing, histories: update tests to reflect allowing anon to create/copy histories via the API 2015-12-11 13:44:48 -05:00
Peter van Heusden 035f1b5d66 * Incorporate documentation fixes from nsoranzo
* Replace {} and .format with %s and % to preserve Python 2.6 compatibility
    * Add a modulepath= paranter to the fake resolver (Bunch object) used to test the modules dependency resolver
2015-12-11 20:43:03 +02:00
Martin Cech f8d95abf06 Merge pull request #1263 from nsoranzo/dev_tool_shed_fixes
Extend the logging of tool dependency status changes.
2015-12-10 20:49:17 -05:00
Nicola Soranzo bce8140bd9 Merge pull request #1285 from jmchilton/test_improvemnts_1
Small API Test Improvements
2015-12-10 19:43:14 +00:00
John Chilton 928ff581ef Fix typo spotted by @nsoranzo. 2015-12-10 11:56:58 +00:00
John Chilton 09a68adb1e Add another API test verifying validation of workflow substitions.
A little different because it targets a different tool, validation, and is inside a repeat.
2015-12-10 00:06:54 +00:00
John Chilton 133e5f2e24 Various small API testing fixes/improvements. 2015-12-10 00:06:53 +00:00
Martin Cech c3e4ae11b0 set client_encoding for TS dockerized test db 2015-12-09 11:37:31 -05:00
carlfeberhard 78427438ad UI, History: refactor the history copy dialog, use it from the options menu (instead of history/copy), pass ui-modal closing_callback a flag whether it was a cancellation or not 2015-12-09 11:07:07 -05:00
Martin Cech 6d16549a46 Merge pull request #1262 from carlfeberhard/fix.js-app-mako
Managers, users: properly return a boolean from has_requests
2015-12-08 12:44:36 -05:00
Martin Cech fe1c9dd293 Merge pull request #1251 from jmchilton/workflow_labels_2
Workflow Editor UI for Step Labels
2015-12-08 12:04:26 -05:00
Nicola Soranzo a22c09b11f Fix typos. 2015-12-08 16:56:27 +00:00
carlfeberhard 38a9aa6a5c Managers, users: update serialized key 'requests' to 'has_requests', update test 2015-12-08 11:43:15 -05:00
John Chilton c14c45be46 Further cache user roles across batched tool executions. 2015-12-06 14:32:05 +00:00
John Chilton e3161b4671 Add support for workflow step labels in editor.
- If a step has a label, display it in the step editor side panel title.
 - Allow clicking the title to change the label.
 - Display the label (if set) as the workflow node box title.
 - Add icon to workflow node since the title might not be related to type anymore.
 - Enforce unique labels accross the workflow in the editor.
 - Qunit test cases for some of this behavior and other recent changes.
2015-12-06 12:27:13 +00:00
John Chilton f6d26c9ee6 Small refactor making workflow views and modules tad more generic.
- Reduce duplication between initializing generic modules and tool modules.
 - Switch tool_id to content_id as variable names throughout the client.
 - Rename get_tool_id to get_content_id on workflow modules.
 - Add some minimal documentation to the workflow module about get_content_id.

Downstream in the subworkflow commit I switch the over-the-wire communication to use content_id instead of tool_id also and use content_ids to refer to workflow ids in subworkflow moduls.
2015-12-06 10:43:09 +00:00
John Chilton 2aa7f04364 Replace __rip_value with dict.pop.
Thanks @bgruening.
2015-12-06 09:50:55 +00:00
John Chilton b11002bef3 Don't iterate over unused key.
Thanks to @bgruening.
2015-12-06 09:50:55 +00:00
Björn Grüning fef8ce2a76 Merge pull request #1248 from jmchilton/maxseconds_debug_2
Attempt to fix transiently failing tool test on Jenkins
2015-12-06 00:57:42 +01:00
Björn Grüning df64706544 Merge pull request #1237 from jmchilton/test_jobs_fix
Fix missing assertion pointed out @nsoranzo.
2015-12-06 00:57:11 +01:00
Björn Grüning 4d252119fd Merge pull request #1216 from jmchilton/workflow_tweaks_1
More small workflow tweaks.
2015-12-05 21:38:34 +01:00
Björn Grüning 6126bd0e93 Merge pull request #1214 from jmchilton/format_2_1
Small enhancements in workflow inputs and outputs
2015-12-05 21:37:50 +01:00
Björn Grüning d7f5dbe4ca Merge pull request #805 from jmchilton/multi_data_param_enhance
Allow multiple collections to be supplied to a multiple data parameter.
2015-12-05 20:09:10 +01:00
John Chilton cae457d8c1 Fail maxseconds test tool if sleep is interrupted. 2015-12-05 18:13:07 +00:00
Martin Cech b0c1cd7460 Merge pull request #1243 from jmchilton/maxseconds_debug
Improved logging related tool test timeouts.
2015-12-05 00:29:27 -05:00
John Chilton 17851ba0ea And fix unit test for b036adcaa166153e544935c12123877c69a7450f. 2015-12-04 20:41:22 +00:00
John Chilton c91a2eb339 Multi data parameter improvements.
Allow multiple collections to be fed to a multi data parameter in one reduction step. Fixes #750 and will really simplify certain classes of tools.

Rebased original with fixes for rerun of such reductions.

Manually tested workflow execution and everything seems fine. The workflow editor already thought this was possible, so that is another bug corrected by this enhancement.

To run the associated API test, execute the following command:

./run_tests.sh -with_framework_test_tools -api test/api/test_tools.py:ToolsTestCase.test_reduce_multiple_lists_on_multi_data

Conflicts:
	static/maps/mvc/dataset/dataset-choice.js.map
	static/maps/mvc/form/form-select-content.js.map
	static/scripts/mvc/form/form-select-content.js
2015-12-04 20:41:21 +00:00
John Chilton 40e6932a25 Fix workflow API tests for workflow output changes. 2015-12-04 20:37:37 +00:00
John Chilton 7b3fa824b6 Update worklfow editor representation of workflow outputs.
Modified this for the workflow export representation but this needed to be updated for the workflow editor because they shared some code in the manager. This was going to be needed downstream when I add labels and uuids to workflow outputs anyway.
2015-12-04 20:36:18 +00:00
John Chilton a597e0e834 Implement workflow outputs for format 2 workflow definitions.
Copy CWL style of specifying a outputs specification block at the top-level of the workflow specification and within that use the "source" attribute to specify the output. Reuse the specification used by "$link"s to describe this output - namely <label_or_order_index>[#<output_name=output>].
2015-12-04 20:34:57 +00:00
John Chilton 1bd0a4e970 Refactoring and more testing of format 2 workflow implementation code...
... toward more reusable design.
2015-12-04 20:34:57 +00:00
John Chilton 70a9f21393 Update workflow format 2 code with infrastructure for nesting runnables.
In downstream work this is used for subworkflows and nested tools. Not sure which of these would potentially hit main line Galaxy first so setting this all up in its own commit.
2015-12-04 20:34:57 +00:00