Commit Graph
1615 Commits
Author SHA1 Message Date
Dannon Baker 37f1976d38 Revert "[WIP] Mega flake8 linting" 2015-07-11 13:17:38 -04:00
Bjoern Gruening eced982622 lint fixes for /test/api/ 2015-07-05 19:50:48 +01:00
Bjoern Gruening ad8175928d lint fixes for /test/unit/ 2015-07-05 19:50:35 +01:00
Bjoern Gruening 09775e058b sqlalchemy linting can be complicated 2015-07-05 18:17:35 +01:00
guerler e51cd719dc Fix remaining qunit test cases for the workflow editor 2015-06-24 13:56:02 -04:00
guerler 53d13e9284 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_002 2015-06-24 12:58:53 -04:00
guerler 63fee8f7ce Undo merged fixed, replace underscore path rewrite 2015-06-24 12:33:17 -04:00
guerler 1ae11cbe08 Fix default qunit test cases for the workflow editor 2015-06-24 12:08:40 -04:00
Eric Rasche f090fb80b0 Merge pull request #395 from jmchilton/tool_env_vars
Allow environment variable definitions in tool XML.
2015-06-24 09:16:53 -05:00
John Chilton 7879327c34 Add more interesting expression to environment_variables demo tool.
Per suggestion by @nsoranzo (https://github.com/galaxyproject/galaxy/pull/395#issuecomment-114827531).
2015-06-24 08:55:44 -04:00
John Chilton 3784fece91 Allow environment variable definitions in tool XML.
An ``<environment_variables>`` top-level XML block can be used to define these.

```
<environment_variables>
    <environment_variable name="FOO">$bar</environment_variable>
    <environment_variable name="FOO2">$bar2</environment_variable
</environment_variables>
```

The expressions are contained in the text of the block.

Implementation Detials:

In order to avoid odd shell expression stuff - the evaluated expressions are written to files and environment variables are read from these files at runtime.

Testing:

A demo tool ``test/functional/tools/environment_variables.xml`` with a test case that can be executed with the following expression.

```
./run_tests.sh -framework -id environment_variables
```
2015-06-23 20:27:07 -04:00
John Chilton 8ac5eb98a5 PEP-8 fixes for entire test/unit/tools module.
Add the module to .ci/pep8_sources.txt.
2015-06-23 20:07:27 -04:00
John Chilton f90e2e12f6 Fix stray print noticed by @nsoranzo.
And add that file to pep8 sources.
2015-06-22 14:41:53 -04:00
John Chilton a5a474fd40 Add example and test case for job configuration expansion.
First suggestion by @nsoranzo and second was easy once example was added to advanced config.
2015-06-22 13:09:23 -04:00
John Chilton 654ffe97ea Update out-dated comment in test_tool_loader. 2015-06-22 10:25:43 -04:00
John Chilton 711d4bb2c5 Modify XML macro parameters to allow arbitrary wrap string.
Previously there were two hard-coded toke types at_tokens an dollar_tokens. Now all tokens for the same macro must have the same wrap string and this string can be set arbitrarily with token_quote attribute. The defualt token_quote value is @.
2015-06-18 14:39:57 -04:00
John Chilton 1de2d73f38 Allow parameterization of XML macros.
This comes in two modes - simple lists of required attributes and per-attribute parameters that may specify defaults.

The following toy example:

```
<tool>
    <expand macro="inputs" bar="hello" />
    <macros>
        <xml name="inputs" dollar_tokens="bar">
            <inputs type="the type is $BAR$" />
        </xml>
    </macros>
</tool>
```

will evalute to ``<tool><inputs type="the type is hello" /><tool>``. The XML macro definition tag can now take in two new fixed attributes dollar_tokens and at_tokens - which will be interpreted as a list of parameter names. Each parameter can be specified when expanding the macros as simple attributes specifying the value of the parameter. The "dollar" parameter with name bar would map to a token with name $BAR$. Likewise an "at" parameter with name foo would map to a token with name @FOO@.

Both parameter types can be specified on a per-parameter basis to also specify default values. So the following example:

```
<tool>
    <expand macro="inputs" foo="hello" />
    <expand macro="inputs" foo="world" />
    <expand macro="inputs" />
    <macros>
        <xml name="inputs" at_token_foo="the_default">
            <inputs>@FOO@</inputs>
        </xml>
    </macros>
</tool>
```

Would evalute to ``<tool><inputs>hello</inputs><inputs>world</inputs><inputs>the_default</inputs>``.

Updated unit tests explain the above much more succinctly - though some like English and words for reasons that escape me.
2015-06-18 14:35:33 -04:00
Nicola Soranzo f8b364b9f5 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into pep8
Conflicts:
	lib/galaxy/tools/parameters/validation.py
2015-06-17 12:44:53 +01:00
Dannon Baker 032dd3e3fd Merge branch 'release_15.05' into dev 2015-06-16 14:44:37 -04:00
John Chilton ea0d5a9c86 Fix bug with runtime post job actions.
Runtime post job actions are post job actions inserted when the workflow is invoked instead of being part of the workflow object in the database. The bug noticed by @kellrott was that these actions were being appended to the original workflow post job actions instead of being transient things just attached to the jobs themselves.

This fixes that problem and adds a test to try to prevent regressions.
2015-06-16 14:18:11 -04:00
Nicola Soranzo 3c40f32fa2 PEP-8 and pylint fixes. 2015-06-16 16:53:49 +01:00
John Chilton 732abcc0db Merge remote-tracking branch 'jmchilton/release_15.05' into dev 2015-06-08 14:04:28 -04:00
Carl Eberhard 5097a9300a [15.05] API, HDAs/Datasets: re-add file_name to detailed serialization for admin users (resolve #313) 2015-06-05 11:45:58 -04:00
John Chilton 620accaaad Extend workflow editor to allow output collections in tools.
Mostly test cases - because I guess I could have sworn it was going to be harder than this.
2015-06-04 14:38:38 -04:00
John Chilton 43166664f2 Merge pull request #297 from bgruening/patch-3
export ENV vars from all dependend repositories
2015-06-03 12:19:14 -04:00
Bjoern Gruening 4268a7ee57 fix unit test 2015-06-02 14:52:40 +02:00
Dannon Baker 8c3fdaa874 Merge 15.05 to dev 2015-06-01 14:14:02 -04:00
Dannon Baker 9f754357d9 Merge pull request #288 from jmchilton/history_tag_fix_15.05
[15.05] Fix tag creation via /tags API endpoints.
2015-05-26 11:42:19 -04:00
John Chilton 44c8e74c29 Fix tag creation via /tags API endpoints.
Add test case to at least check for exceptions such as those reported.

Closes galaxyproject/bioblend#145.
2015-05-25 22:31:09 -04:00
John Chilton 1a39b6aa79 Merge remote-tracking branch 'jmchilton/release_15.05' into dev 2015-05-20 15:48:25 -04:00
John Chilton f469db3d7e Fixes for boolean & select handling in test data elements.
- Allow boolean "truevalue"/"falsevalue" to be used in plain (non-conditional test element) parameters (see https://trello.com/c/iGk3f1pE).
 - Fix conditionals to use processed values - so this fix and 5b6c092aa0 are applid to these elements as well. (http://osdir.com/ml/general/2015-05/msg24402.html).

This also adds tests to verify these behaviors.

Run most relevant tests with commands:

    ./run_tests.sh -framework -id simple_constructs
    ./run_tests.sh -framework -id multi_select
    ./run_tests.sh -framework -id boolean_conditional
2015-05-19 12:43:32 -04:00
Daniel Blankenberg 7c27b4456f Merge pull request #266 from jmchilton/fix_tool_test_function_name
Fix function names for dynamic tool test functions.
2015-05-18 11:20:10 -04:00
John Chilton 906e9a0809 Fix function names for dynamic tool test functions.
When finding methods to invoke it seems nose uses the raw function name instead of the class's attribute name (I guess this terminology makes sense), but when reporting results it uses the latter. Synchronizing these names therefore allows calling specific tool test methods from the command-line.

This change is required to implement galaxyproject/planemo#145.
2015-05-15 15:47:35 -04:00
John Chilton 308a8e3737 Merge remote-tracking branch 'galaxyproject-careful/release_15.05' into dev
Conflicts:
	config/plugins/interactive_environments/ipython/config/ipython.ini.sample
2015-05-15 13:41:29 -04:00
John Chilton 4ad4688fde Fix label's on output collections.
Thanks to @kellrott for reporting the issue.

https://trello.com/c/Qc2A4rsw
2015-05-14 16:33:39 -04:00
Nate Coraor 656d9bef50 Merge remote-tracking branch 'upstream/release_15.05' into dev
Conflicts:
	lib/galaxy/version.py
2015-05-14 11:11:46 -04:00
guerler 32e027d431 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into library_data_parameter
Conflicts:
	static/maps/mvc/form/form-section.js.map
	static/scripts/mvc/form/form-section.js
2015-05-13 04:19:08 -04:00
Carl Eberhard d1c14bd1a1 Histories, API: do not consider deleted datasets when calculating history state; test 2015-05-12 16:57:17 -04:00
Martin Cech 273bae44ec Merge pull request #249 from jmchilton/no_slice
Add env test option for disabling truncation of test diffs.
2015-05-11 14:11:51 -04:00
John Chilton 4d69f2e8c0 Fix a variety of tool shed tests broken with a24e206. 2015-05-11 11:57:05 -04:00
John Chilton 593d38fcf0 Fix a variety of tool shed tests broken with PR #75. 2015-05-11 11:56:26 -04:00
John Chilton bf9a2ab4ea Add env test option for disabling truncation of test diffs. 2015-05-10 17:41:33 -04:00
Carl Eberhard d675a6a0b3 Testing: use unittest2 to allow 2.7 assertions 2015-05-07 17:50:56 -04:00
Carl Eberhard a0bd971beb Testing, qunit: rename paired-collection-creator test to match actual mvc script, update README to include silent error warning 2015-05-07 13:26:39 -04:00
Carl Eberhard 19d00d6ac6 Testing, qunit: remove unfortunately silent error of missing global Galaxy when running via require and phantom by checking scope first, update list of pairs tests with recent option changes, remove debugging cruft 2015-05-07 13:26:38 -04:00
Martin Cech d28ea45556 Merge branch 'release_15.05' into dev
Conflicts:
	config/plugins/visualizations/common/templates/script_entry_point.mako
2015-05-07 13:09:24 -04:00
Nate Coraor 74527e2031 Merge remote-tracking branch 'upstream/release_15.05' into dev 2015-05-06 15:25:47 -04:00
John Chilton 04bc0b2111 Fix assertions in test_VisualizationsRegistry.py...
...that were implicitly assumed fixed Python hashing.
2015-05-06 14:12:25 -04:00
John Chilton bc48ac15d5 Update tool tests to reflect get_tool is non-deterministic...
... if supplied a short id instead of a GUID and there are multiple versions of a shed tool with the same short id installed.
2015-05-06 14:06:16 -04:00
John Chilton 499108432a Attempt to fix manager, viz, and web unit tests for Python 2.6...
... using unittest2.
2015-05-06 14:06:16 -04:00