Commit Graph
635 Commits
Author SHA1 Message Date
mvdbeek 76be1263ca Test that workflows with hidden params can be run 2019-03-04 18:41:51 +01:00
mvdbeek a36b56e694 Drop redundant wait for history
wait_for_invocation_and_jobs does that already, thx @nsoranzo.
2019-02-05 15:39:42 +01:00
mvdbeek cf68cbe907 Verify that list:list will be reduced to list in multi data input 2019-02-05 14:11:27 +01:00
Nicola Soranzo 7a9422600c Fix `GalaxyInteractorBackwardCompatTestCase.test_local_test_data_download` API test
Broken in commit bf851269c3 .
2019-01-17 16:39:48 +01:00
mvdbeek 4b920afba2 Make interactor changes backwards compatible 2019-01-10 14:44:14 +01:00
mvdbeek cd8b129b8e Fix test_test_data_download
This contains 5 items after
https://github.com/galaxyproject/galaxy-test-data/pull/2 had been
merged.
2019-01-04 19:13:11 +01:00
mvdbeek 4877bfafa6 Test that test-data paths outside of test-data folder cannot be downloaded 2019-01-01 21:37:03 +01:00
mvdbeek 6791f3b999 Also allow downloading test-data directories
This is (apparently ...) used by tools that create/test
directories in the extra_files_path.
2018-12-31 10:19:31 +01:00
mvdbeek 0d28c65c3d Allow anonymous downloading of test-data files 2018-12-31 10:19:31 +01:00
Martin Cech 11428a03b8 Merge pull request #7019 from jmchilton/path-aware-workflows
File-based Workflow Editor
2018-12-07 16:18:26 -05:00
John Chilton 8470e91296 Merge pull request #7020 from frederikcoppens/public_api_wf
Expose published workflows through API
2018-11-21 13:13:50 +01:00
John Chilton 45345533fb Test cases for public WF access to published workflows. 2018-11-21 08:59:40 +01:00
John Chilton 9bac3c44fa Path-aware workflows.
- Allow workflows to be uploaded via path using the GUI and and API for admins.
- Track the path and resync workflows on save (both .ga and format 2 workflows) - this will allow Planemo to leverage the Galaxy workflow editor to interactively save workflows.
2018-11-20 15:49:51 +01:00
Nicola Soranzo f9685459a4 Merge pull request #6850 from jmchilton/workflows_track_step_inputs
Track workflow step input definitions in our model.
2018-11-16 19:13:05 +01:00
John Chilton 67efd072ae Track workflow step input definitions in our model.
We don't track workflow step inputs in any formal way in our model currently. This has resulted in some current hacks and prevents future enhancements. This commit splits WorkflowStepConnection into two models WorkflowStepInput and WorkflowStepConnection - normalizing the previous table workflow_step_connection on input step and input name.

In terms of current hacks forced on it by restricting all of tool state to be confined to a big JSON blob in the database - we have problems distinguishing keys and values when walking tool state. As we store more and more JSON blobs inside of the giant tool state blob - the worse this problem gets. Take for instance checking for runtime parameters or the rules parameter values - these both use JSON blobs that aren't simple values, so it is hard to tell looking at the tool state blob in the database or the workflow export to tell what is a key or what is a value. Tracking state as normalized inputs with default values and explicit attributes runtime values should allow much more percise state definition and construction.

This variant of the models would also potentially allow defining runtime values with non-tool default values (so default values defined for the workflow but still explicitly settable at runtime). The combinations of overriding defaults and defining runtime values were not representable before.

In terms of future enhancements, there is a lot we cannot track with the current models - such as map/reduce options for collection operations (https://github.com/galaxyproject/galaxy/issues/4623#issuecomment-389544980). This should enable a lot of that. Obviously there are a lot of attributes defined here that are not yet utilized, but I'm using most (all?) of them downstream in the CWL branch. I'd rather populate this table fully realized and fill in the implementation around it as work continues to stream in from the CWL branch - to keep things simple and avoid extra database migrations. But I understand if this feels like speculative complexity we want to avoid despite the implementation being readily available for inspection downstream.
2018-11-15 21:34:02 +01:00
John Chilton c06a142e04 Workflow test case, inputs as outputs. 2018-11-15 18:15:47 +01:00
Marius van den Beek e98f63caf2 Merge pull request #6925 from jmchilton/workflow_step_parameters_3
Add workflow step parameters to workflow editor (try 3)
2018-11-10 20:45:32 +01:00
John Chilton 82a8eb05d6 Merge remote-tracking branch 'jmchilton/release_18.09' into dev_merge_1 2018-11-06 09:10:22 -05:00
John Chilton dd8d74f364 Unify data/non-data input/output handling for workflow editor.
Don't treat data and non-data inputs/outputs different at the API boundary or at the workflow-manager.js level. Keep differences at the level of walking inputs/outputs in the workflow module on the backend and at the terminal definition (models and views) level on the frontend. Make the code and interfaces more consistent in my opinion and is more compatible with future directions I'd like to take things with mix-mode inputs/outputs for CWL.
2018-11-05 20:52:25 -05:00
Marius van den Beek c3dc2392ce Merge pull request #6954 from jmchilton/workflow_tests_2
Small API Workflow Test Improvements.
2018-11-05 14:22:59 +01:00
mvdbeek 9b42032098 Fill in default state for test_optional_workflow_output 2018-11-05 13:09:31 +01:00
M Bernt 4e098c5d52 tests: add parameter to output_filter 2018-11-01 17:23:17 +01:00
John Chilton f035d642ce Merge pull request #6844 from jmchilton/compressed_types_and_extra_files
Infrastructure/API Support for Composite Uploads/Downloads
2018-11-01 10:57:09 -04:00
John Chilton 06aea92eb8 cleaner test test_run_subworkflow_runtime_parameters 2018-11-01 10:37:51 -04:00
John Chilton d4b6bf28b5 Test for parameter replacement of GUI-style normalized parameters. 2018-11-01 10:37:49 -04:00
John Chilton 7bd7abb5ee Fix linting of dev. 2018-10-26 10:01:56 -04:00
Marius van den Beek dda297c408 Merge pull request #6776 from jmchilton/gxformat2_integration
Allow API import/export of format 2 workflows.
2018-10-26 14:10:33 +02:00
John Chilton e3bc005a86 Implement API endpoint for indexing extra files in a dataset. 2018-10-24 09:55:25 -04:00
John Chilton dd6b185ab8 Implement composite uploads on arbitrary datatypes.
Prior to this, composite uploads were only allowed for select data types. As far as I can tell, the framework itself allows arbitrary datatypes to have extra files. This allows the upload API to take in extra files for datatypes that aren't explicitly annotated has having extra files.

These may be specified one at a time or in directory structures via tar files.
2018-10-24 09:55:25 -04:00
Pierrick ROGER 35093e38fc Remove spaces in blank line. 2018-10-18 11:16:29 +02:00
Pierrick ROGER efc7864cab Merge branch 'dev' into feature/isa_data_type 2018-10-18 10:36:49 +02:00
John Chilton cdd1520434 Rework most test workflows to label maps for step definitions 2018-10-12 13:41:13 -04:00
John Chilton 14978355ee Support for de-duplicated workflow import. 2018-10-12 13:41:06 -04:00
John Chilton b0334c0c06 Add CWL-style doc keyword to format2 workflows, map to annotations. 2018-10-12 13:41:06 -04:00
John Chilton 00625839b3 Allow downloading Galaxy workflows as format 2 workflows. 2018-10-12 13:41:06 -04:00
John Chilton feddcfaa5a Allow upload format 2 workflows to Galaxy. 2018-10-12 13:41:06 -04:00
Nate Coraor ca95d7a26e Merge remote-tracking branch 'upstream/release_18.09' into dev 2018-10-12 10:32:43 -04:00
John Chilton f3da0864b4 Test case for regression #6856. 2018-10-12 09:03:12 -04:00
John Chilton fb52755601 Merge pull request #6811 from jmchilton/gxformat2_060
Support for Enhancements to gxformat2 (part II)
2018-10-10 08:42:37 -04:00
John Chilton a8843ece34 Allow CWL-style id map for workflow inputs 2018-10-09 08:18:29 -04:00
John Chilton 915c1a9b66 Remove unused variable in test_workflows. 2018-10-09 08:18:29 -04:00
John Chilton 8ba76c9704 Switch to CWL-style format 2 workflow output definitions. 2018-10-09 08:18:29 -04:00
John Chilton 1e2080242c Toward newer style gxformat2 definitions. 2018-10-09 08:18:29 -04:00
Nicola Soranzo 6b3f672770 Replace deprecated assertEquals() method
Fix warnings during py34-unit tests like:

```
/home/travis/build/galaxyproject/galaxy/test/unit/workflows/test_extract_summary.py:46: DeprecationWarning: Please use assertEqual instead.
  self.assertEquals(job_dict[hda.job], [('out1', derived_hda_2)])
```

See e.g. https://travis-ci.org/galaxyproject/galaxy/jobs/438829277
2018-10-09 12:37:15 +01:00
John Chilton d010077830 Allow workflow import of workflows with connections that don't have matching empty tool state entries.
There is a long conversation in the added doc string.
2018-10-06 09:39:21 -04:00
John Chilton c7fa2860d8 Toward new format2 syntaxes in test workflows. 2018-10-06 09:39:21 -04:00
John Chilton 319c29937e gxformat2 - allow CWL style 'in' declarations for step connections.
Makes gxformat2 look a lot closer to CWL workflows with Galaxy tools and state.
2018-10-06 09:39:21 -04:00
Marius van den Beek 10e984ce85 Merge pull request #6746 from jmchilton/workflow_state_touch_1
Fill in needed state defaults when importing manually crafted workflows.
2018-10-06 10:17:41 +02:00
Dannon Baker 55c90960e9 Merge remote-tracking branch 'upstream/release_18.09' into dev 2018-10-01 10:53:11 -04:00
mvdbeek ab660686c2 Add test for single and multi-input identifiers
test_identifier_map_over_input_in_conditional fails at the
moment (same issue as in https://github.com/galaxyproject/galaxy/issues/6182)
2018-09-28 19:01:28 +02:00