Commit Graph
333 Commits
Author SHA1 Message Date
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
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 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
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
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 59944046b7 Fix for workflow progress unit testing. 2015-12-03 11:32:24 +00:00
John Chilton 48340b5829 Add TODO items to workflow progress unit tests. 2015-12-01 23:44:26 +00:00
John Chilton 07c3d10f31 Extend workflow recovery progress test case to include replacement check. 2015-12-01 23:44:26 +00:00
John Chilton 7974c1f334 Add unit tests for workflow progress initialization. 2015-12-01 23:44:26 +00:00
John Chilton cf367ff0c7 Add another workflow progress test case.
This one for replacing a tool input with an input dataset.
2015-12-01 23:44:26 +00:00
John Chilton 031a39aba8 Basic unit tests for workflow progress tracking. 2015-12-01 23:44:26 +00:00
John Chilton 21213ef70f Refactor workflow testing code to quickly bootstrap workflows. 2015-12-01 23:44:26 +00:00
John Chilton 28501ab676 Refactor workflow manager for extension. 2015-12-01 23:44:25 +00:00
Nicola Soranzo b6451d0be6 Fix bugs in test and code introduced in PR #1113. 2015-11-23 15:18:57 +00:00
Martin Cech 2e510bd5e1 Merge pull request #1113 from jmchilton/format_source_collection
Allow accessing collection elements in format_source.
2015-11-21 23:38:39 -05:00
Martin Cech ab0829f2e8 Merge pull request #1096 from jmchilton/format_2
Outline "Format 2" workflow definitions.
2015-11-20 22:05:42 -05:00
Dannon Baker f61ec1c3c0 Merge and rebuild client 2015-11-19 20:34:32 -05:00
John Chilton 05f3da308d Fix macro bug with empty CDATA being None instead of ''.
Fixes galaxyproject/planemo#362 thanks for the report @erasche.

Test using the following command:

```
nosetests test/unit/tools/test_tool_loader.py
```
2015-11-18 12:25:38 +00:00
John Chilton b4c77b7617 Introduce "Format 2" workflow definitions.
This is a slight tightening up of the ad-hoc, experimental workflow YAML definition used by the test framework (and by Kyle, but lets just admit Kyle is part of Galaxy's test framework).

This format is still defined entirely client side by transcoding the YAML or python object description into real (or format 1) Galaxy workflows - so these cannot realisticaly be declared part of Galaxy's public interface and can remain experimental and subject to change.

In addition to refactoring the code implementing these workflows for upstream modifications to explore new features, the format itself has been made slightly more stringent in two ways:

 - 'steps' must now be explicit (previously converted auto-convert list to dict).
 - Ensure the workflow declared a 'class' is defined and the class is 'GalaxyWorkflow'.

This will help with discovery of workflow objects with downstream tooling (planemo for workflows?) and brings the Galaxy definition slightly more inline with the CWL definition for workflows (very slightly).
2015-11-18 10:50:43 +00:00
John Chilton 312746d169 Allow accessing collection elements in format_source.
Can do it by numeric index or element name, e.g. input[0] or input["forward"]. Only works for 1-D collections.

Implements #699.

Run new and most relevant existing tests with the following commands:

```
nosetests test/unit/tools/test_actions.py
./run_tests.sh -framework -id output_format_collection
./run_tests.sh -framework -id output_format
```
2015-11-17 14:13:14 +00:00
John Chilton 6b521a3557 Fix failing tests for output checker changes. 2015-11-10 13:55:32 +00:00
Dannon Baker e423ab6246 Merge pull request #428 from natefoo/smash_eggs
Replace eggs with wheels
2015-10-22 18:44:35 -04:00
Nate Coraor c893afda00 Merge branch 'dev' into smash_eggs 2015-10-19 11:46:58 -04:00
Michael R. Crusoe 86c0e273aa pep257 compliant doc upgrade
Line wrapped to 79 charecters, except for some doc summary lines.

Dropped the no-op, unused CachingObjectStore

Renamed `create_object_in_session()` to `_create_object_in_session()` to mark
it as private.
2015-10-15 01:50:02 -07:00
Nate Coraor 433b79de2b Merge branch 'dev' of https://github.com/galaxyproject/galaxy into smash_eggs 2015-10-13 16:54:18 -04:00
Nate Coraor 6449db2a4c Fix broken unit test caused by addition of the job wrapper's
galaxy_virtual_env attribute
2015-10-13 12:45:34 -04:00
John Chilton 4cebca81c6 Redo total disk calculation adjustments to be less race condition-y.
... at least when finishing the job. Method should probably be used other places as well.
2015-10-12 09:26:34 -04:00
guerler ee1136d5bf Fix test cases
Fix lint

Fix lint

Fix test messages

Remove unnecessary variable

Remove unused test helper functions

Fix lint

Fix error message in tests

Fix spaces
2015-10-06 19:12:06 -04:00
guerler 6d00f38f0a Merge branch 'dev' of https://github.com/galaxyproject/galaxy into tool_form_003
Conflicts:
	client/galaxy/scripts/mvc/tools/tools-form.js
	static/maps/mvc/tools/tools-form.js.map
	static/scripts/mvc/tools/tools-form.js
2015-09-29 15:55:59 -04:00
John Chilton ac18cbe978 Improved "special" tool loading.
Instead of writing out the tools on startup (a more expensive operation than reading), just read the existing files in. Add new abstraction to the tool panel to reduce some otherwise duplicated code.

Testing:

The following two API tests should cover the modified behavior, they verify that metadata is still detectable and that history import and export still works.

```
./run_tests.sh -api test/api/test_histories.py:HistoriesApiTestCase.test_import_export
./run_tests.sh -with_framework_test_tools -api test/api/test_tools.py:ToolsTestCase.test_rdata_not_decompressed
```
2015-09-29 13:57:15 +01:00
John Chilton 86c4263b34 Fix unit tests broken with f935d27bdf. 2015-09-25 11:04:12 +01:00
guerler 57f023529a Remove tool form mako
Fix new-line
2015-09-23 16:10:56 -04:00
Nate Coraor f334764627 Egg cleaning in test/ 2015-09-22 10:32:16 -04:00
Nicola Soranzo c01cf85d45 Use __file__ when adding paths to sys.path instead of os.getcwd() .
Also insert additional paths in position 1 unless strictly necessary.
2015-09-11 19:05:37 +01:00
John Chilton 9711a60b82 Merge pull request #640 from carlfeberhard/managers
Allow deserializing dataset permissions
2015-08-27 18:08:20 +01:00
Nicola Soranzo e958041255 Merge branch 'master' into dev
Conflicts:
	lib/tool_shed/metadata/metadata_generator.py
2015-08-27 17:13:45 +01:00
Dannon Baker dc7f7f2e3b Fix mock_trans to provide a user_is_admin member 2015-08-26 15:11:13 -04:00
Eric Rasche 71125326f8 Merge pull request #649 from jmchilton/yield_at_top_level
[15.07] Fix yield statements at the top level of macros.
2015-08-25 17:39:02 -05:00
John Chilton dc6700eec5 Fix yield statements at the top level of macros.
Fixes #647.
2015-08-25 16:51:59 +01:00
Nicola Soranzo 0f883ef776 Merge branch 'release_15.07' into dev
Conflicts:
	lib/galaxy/model/__init__.py
2015-08-20 14:12:27 +01:00
Nicola Soranzo a34f13a9f6 Merge branch 'release_15.05' into release_15.07 2015-08-20 14:07:09 +01:00
John Chilton a9827fae31 Fix failing tests for 238d908cce. 2015-08-20 06:45:11 +01:00
Carl Eberhard d59c846dc3 Dataset manager: allow deserializing permissions 2015-07-24 13:15:34 -04:00
Carl Eberhard 10638bad6a Merge remote-tracking branch 'upstream/dev' into managers 2015-07-23 15:05:35 -04:00
Carl Eberhard 7f22635d04 Testing: Remove permissions from serializer tests 2015-07-23 15:05:32 -04:00
Carl Eberhard 504b9a263b Fix to 5a0aa61: use file_name and not permissions in testing additional keys via the serializer 2015-07-23 14:40:04 -04:00
Carl Eberhard a9c0baae29 Testing: set order of tags in hda manager tests 2015-07-23 09:38:25 -04:00