Commit Graph
1865 Commits
Author SHA1 Message Date
John Chilton 0902c23f34 Merge pull request #1501 from guerler/fix_disabled_000
[16.01] Fix disabled css
2016-01-14 04:08:18 -05:00
guerler 4b5b970d78 Fix disabled css 2016-01-13 20:50:40 -05:00
Dannon Baker 2f1dbeee68 Address W503 and E721 errors now enforced by pep8 1.7. 2016-01-13 10:41:27 -05:00
John Chilton 55677f2d3d Fix to ensure integrity of tool_script.sh also.
Previously the job script underwent these checks and I had assumed since that got written later it would never be the case that tool_script.sh wouldn't be synchronized by the job script was - turns out file systems are more creative and less logical than one might expected.

Also increases the count for the number of syncs that will execute because 15 on rare occasion proved not to be enough as well as making both the count and sleep time configurable.
2016-01-13 14:58:28 +00:00
John Chilton dff94d743f "Fix" collection outputs to hide the HDAs in the history.
Long term this is just not a solution, but it is the strategy we use for mapped over output HDAs also.

Rebased and fixed based on comments from @nsoranzo indicating the previous attempt did absolutely nothing to fix the problem.

xref https://github.com/galaxyproject/tools-iuc/pull/412/files

Conflicts:
	lib/galaxy/tools/actions/__init__.py
2016-01-08 17:04:51 +00:00
Dave B 073609d005 Fix casper tests. 2016-01-06 13:58:13 +00:00
John Chilton b9faf84b24 Stub an API test for tours so I can refactor a little. 2016-01-05 00:18:22 +00:00
Eric Rasche 5a441044fb Merge pull request #1308 from jmchilton/multi_collection_types
Allow input collections to specify multiple collection types.
2016-01-04 14:43:37 -06:00
John Chilton 61f4c82642 Add test case for importing a workflow with missing tool. 2016-01-04 09:55:44 +00:00
Björn Grüning 34bb21c411 Merge pull request #1407 from guerler/revise_masthead_000
Masthead/Scratchbook revision and test cases
2016-01-04 01:31:44 +01:00
Björn Grüning 905adbac38 Merge pull request #1412 from jmchilton/isolate
Isolate tool commands by default.
2016-01-04 01:28:41 +01:00
John Chilton 4086dd61da Implement toolbox monitoring.
- Add monitor tag on toolbox root elements to force Galaxy to watch the toolbox for changes.
 - Refactoring and test improvements for existing tool monitoring code.
 - Implement toolbox shutdown process to ensure different watchers don't compete with each other.
 - Set the default tool conf to be monitored.
2016-01-03 13:10:08 +00:00
John Chilton b68991c4ca Allow loading tool confs written in YAML and JSON.
Because lets say someone was writing a programatic way to manage elements in a tool conf, that hypothetical person probably shouldn't be writing XML.
2016-01-03 13:10:08 +00:00
John Chilton 1084f14dd0 Unit test modifications for running tool commands in isolated scripts. 2016-01-02 14:29:13 +00:00
John Chilton 868a7dfe0e Modify unmodified conda behavior.
- Add configuration option for overriding condarc location used by conda resolve commands.
 - Default location of condarc to be in tool_dependency_dir.
 - Delay updating the condarc to ensure channels until this would actually be needed (during package installation).
 - Add configuration flag to allow Galaxy to *NOT* check the PATH for conda.
 - Update unit test that verifies conda's installation to never use conda on PATH, since a precondition of this test is that certain packages haven't been installed previously.
 - Change default behavior to not check the PATH for conda, everything else here I feel pretty good about - this I'm ambivalent about - it will reduce error reports and problems with network filesystems, but doesn't seem to be good Unix best practice.

Points 2 and 3 above should address this issue: https://github.com/galaxyproject/ansible-galaxy-extras/pull/33#issuecomment-168384555

This commit also addresses most of #1406.
2016-01-02 12:38:20 +00:00
guerler 4cd621dd37 Add test cases 2015-12-31 01:46:37 -05:00
Eric Rasche 0aa1c5133e Merge pull request #1345 from jmchilton/conda_0
Implement a conda dependency resolver.
2015-12-30 15:03:52 -06:00
John Chilton 204aa96206 API-ify tool dependency resolution. 2015-12-30 20:17:44 +00:00
John Chilton cd32b91dc9 Update inputs_as_json.xml to drop version attribute.
Also add note about filename.
2015-12-30 11:24:01 +00:00
John Chilton de0c913b8b More work on converting tool inputs to json.
- Drop version requirement per commends by @bgruening.
 - Add examples for conditionals, repeats, sections, colors, and booleans specified truevalue/falsevalue.
 - Various bug fixes unearthed by new test cases.
2015-12-30 11:17:13 +00:00
John Chilton d5d404c912 Implement special config file to dump parameters as json.
```
    <configfiles>
        <inputs name="inputs" format="json" version="1" />
    </configfiles>
```

Version is specified as 1, because the Galaxy tool plumbing doesn't really distinguish between parameter is '', parameter was explicitly supplied as None, parameter was absent, etc... - everything is a just a string in some ways. This distinction may be more important with JSON and for instance the CWL will require more percision, so we may want to revise Galaxy's tool handling in a backward compatible way someday.
2015-12-29 15:09:49 +00:00
Martin Cech 14a618ee3a Merge pull request #1401 from jmchilton/transient_tests_2
Fix and potential fix for transiently failing tests.
2015-12-28 12:00:29 -05:00
John Chilton 1148081435 Implement a conda dependency resolver.
Much more information on planemo PR that I used to build a test bed for this:

https://github.com/galaxyproject/planemo/pull/392

Also syncs galaxy with planemo shared library changed.
2015-12-26 22:46:28 +00:00
Martin Cech 6aa7691a63 Merge pull request #1137 from jmchilton/workflow_api_order_2
Finish swapping unencoded ids with order_index in workflows API.
2015-12-26 16:59:52 -05:00
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 355bb281e2 Finish swapping unencoded ids with order_index in workflows API.
Running a workflow or showing a workflow can both restore the previous behavior by passing legacy=True as an API parameter. By changing these two endpoints in tandem I believe backward compatiblity for most existing code should be maintained unless:

 - The external application saved these workflow IDs previously and re-runs workflows without refetching the workflow definition. I could imagine Refinery for instance might do this and will have to update indexed workflows or add legacy=True to workflow requests.
 - The external application contacted the database directly after using this API endpoint to fetch more information about the step (seems unlikely).

See conversation:
 - http://dev.list.galaxyproject.org/workflow-API-step-order-vs-step-id-in-bioblend-td4668367.html

Rebased with changes suggested by @nsoranzo.
2015-12-20 14:39:20 +00: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 8af5671953 Allow input collections to specify mutiple collection types.
Parallelling format specifier which can take multiple formats.
2015-12-13 13:38:50 +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