417 Commits
Author SHA1 Message Date
John Chilton 84ad9c2ee2 Rev Pulsar to 0.7.0.dev3.
- Fixes numerous problems mostly notably fixes external metadata generation and job metrics collection for recent Pulsar. This was broken when tools were given clean working directory.
 - Produce a new message if an older Pulsar version is targetted via REST of library (should help with upgrading to Galaxy 16.04).
 - Newer pulsar lib allows more flexible configuration of managers - update documntation to reflect this.
2016-04-10 23:54:02 -04:00
John Chilton 3b31f23eb6 Fix deps.command.download_command on Mac OS X.
Previously -O- and --recursive would be used together - this doesn't seem to be possible on Mac OS X.

See issue https://github.com/galaxyproject/planemo/issues/431.
2016-04-04 12:04:01 -04:00
John Chilton e02e97dc79 Merge pull request #2067 from jmchilton/shed_tests
Adjust testing directories so no python root is ever "tool_shed".
2016-04-01 22:30:27 -04:00
John Chilton 4c216f1077 Adjust testing directories so no python root is ever "tool_shed".
We have a tool_shed directory in lib, so if we enter a test case from some path and test/tool_shed happens to be a valid python top-level module - it blocks out lib/tool_shed and Galaxy doesn't work properly in the test.

A similar problem was encountered with unit tests and fixed with https://github.com/galaxyproject/galaxy/commit/df442a06382f23bdf0401bdd632b9584d3431281 - but I have decided that directory name was a bit log and so this commit unifies the approach to unit and functional test names for tool shed tests.
2016-04-01 10:09:49 -04:00
Nicola Soranzo 205850586e Use a stricter regexp for microseconds. 2016-04-01 14:46:30 +01:00
carlfeberhard 46b4e8d94c Managers: remove UTC zone when parsing dates
This change creates a more complete regex for parsing dates used in filters. MySQL in particular errored when the UTC zone character 'Z' was appended to a valid iso 8601 date (because it's MySQL). The FilterParser.parse_date method now:
- strips both the separator 'T' and any ending 'Z'
- one space are allowed as the date/time separator
- milliseconds are permitted
- both time and time with milliseconds are optional
- any added timezone (besides the UTC Z) will cause an error
- feedback was made more clear
- tests were added (and should make the above more clear)
2016-03-31 15:00:50 -04:00
Dannon Baker d15b1030c5 Merge, rebuild. 2016-03-29 16:03:18 -04:00
John Chilton 7b2a2b1ef1 [16.01] More robust test_lazy_process.
Hopefully this will fix a transiently failing test (I've only seen in fail on OS X).
2016-03-29 12:24:51 -04:00
John Chilton 975937ec9d Fix docker tool execution for #1688.
Thanks for @kellrott for the bug report.

\#minor
2016-03-22 10:02:32 +00:00
guerler 773095d403 Unify json representation for regular datasets and collections 2016-03-10 11:58:58 -05:00
guerler 40c9e1af25 Use value_to_basic and to_json when populating the tool model 2016-03-10 02:54:43 -05:00
guerler 96b1274b12 Remove encode_runtime_state 2016-03-05 13:00:02 -05:00
guerler 9f5b7a5f66 Revise tool state encryption, remove copy/paste hacks 2016-03-05 12:34:14 -05:00
Dannon Baker 9f590b8a0e Merge branch 'release_16.01' into dev 2016-03-01 09:57:34 -05:00
Björn Grüning 052187b80c Merge pull request #1747 from dannon/svg_lib_swap
Swapping from svgfig to svgwrite
2016-02-29 20:34:02 +01:00
Björn Grüning db59b9b703 Merge pull request #1688 from jmchilton/16.04_jobs
Overhaul of Tools and Jobs for 16.04
2016-02-28 00:12:06 +01:00
guerler fa27f3c63c Add spaces 2016-02-26 19:09:05 -05:00
guerler 2f015881c4 Revise legacy handling 2016-02-26 18:00:11 -05:00
John Chilton cb19630bd4 Fix unit tests for 56076db848 2016-02-26 12:25:34 +00:00
Dannon Baker 4dce3e35d7 Toolshed/test swaps from standalone_xml to tostring 2016-02-25 14:20:00 -05:00
Nate Coraor d21cc83fc2 Tests for some of the 16.01 security vulnerabilities 2016-02-24 17:03:39 -05:00
John Chilton b8a6302aa8 Migrate tool sanitize and refresh options to parser framework.
Trying to get everything in there in general and need to disable sanitize for CWL tools downstream using this override point.
2016-02-22 11:03:21 +00:00
John Chilton a2e3140375 Give tool executions a clean working directory.
Rather then massively renaming job_directory and job_working_directory, I introduce the concept of the tool execution working directory (tool_working_directory) that is the job working directory + "/working" and that will not be populated with job files.

Some legacy cruft in there for the upgrade, things like galaxy.json and dynamic outputs may be in the job working directory or the tool execution working directory.
2016-02-22 10:47:11 +00:00
John Chilton 0eab8346b3 Rename config.job_working_directory to config.jobs_directory. 2016-02-22 10:47:11 +00:00
John Chilton b92074e6ff Implement profile="XX.XX" on tools, better defaults for newer tools.
- set -e in tool command scripts.
 - Disable implicit extra file collection. All dynamic extra file collection requires a <discover_datasets tag.
 - Disable format="input" - require explicit metadata targets (metadata_source, format_source).
 - Disable interpreter= - hacky and doesn't work as expected in too many circumstances. Use $__tool_directory__.
 - Disable $param_file - grepping the command for the string is impercise. If useful we can add flag to match the flag used to produce inputs as a JSON file.
 - Disable default version of 1.0.0, the IUC has made it clear they prefer all tools have an explicit version.

Fixes #1609.
2016-02-22 10:47:11 +00:00
John Chilton d020522650 Introduce strict shell command option.
Newer tool formats (CWL and YAML just enable this by default), but XML tools can add a strict="true" to the command block to force "set -e" handling on the shell part of tool execution.

Run the framework tests verifying the new and older default behavior using the following commands:

```
./run_tests.sh -framework -id strict_shell_default_off
./run_tests.sh -framework -id strict_shell
```
2016-02-22 09:58:43 +00:00
Martin Cech d7eb315f72 Merge pull request #1610 from jmchilton/discovered_dataset_keys
Improve dbkey handling for discovered datasets.
2016-02-19 13:28:23 -05:00
guerler 5041c80d85 Fix optional column parameter handling and accept_default tag 2016-02-18 19:17:07 -05:00
guerler 664ae0c8df Attempt to strip legacy collection handling, fixes 2016-02-18 17:41:41 -05:00
Dannon Baker 1e46198bec Merge pull request #1602 from carlfeberhard/history.contents
API, history contents: allow filters, limit/offset, and ordering
2016-02-10 11:34:48 -05:00
Martin Cech db1bb2f191 Merge pull request #1556 from jmchilton/datatype_imports
Code design and legacy cleanup of datatypes and metadata.
2016-02-09 12:44:59 -05:00
carlfeberhard 1561759919 (merge conflicts with dev) 2016-02-09 10:27:21 -05:00
carlfeberhard c423f1eaa5 API, history_contents: allow filtering by update/create times, inclusion in type_id list; models: add type_id as sql property on HDCAs and HDAs; managers: allow count; testing 2016-02-09 10:25:39 -05:00
John Chilton 8cf990bd7f Revise dbkey handling for discovred datasets.
Newer style <discover_datasets>'s based discovery will default to using input_dbkey the way normal inputs do. Legacy, implicit filename based discovery will continue to use '?' as the default.

This should work for collections and individual extra outputs.

Fixes #1598.

Thanks to @gregvonkuster for finding this issue and documenting it so thoroughly.
2016-02-09 13:30:32 +00:00
carlfeberhard 4279099292 Merge remote-tracking branch 'upstream/dev' into managers.ratable 2016-02-08 11:47:42 -05:00
carlfeberhard 4d75d1c641 Managers, ratable: clean up, test, and fix 2016-01-29 13:11:58 -05:00
guerler f8e3fa51f4 Apply suggested fixes, fix test cases 2016-01-28 14:38:47 -05:00
carlfeberhard 48f45cb185 Testing: remove egg import from test_HistoryContentsManager 2016-01-21 16:37:21 -05:00
carlfeberhard 8ab1607b55 Testing: remove unused imports in test_HistoryManager 2016-01-21 15:00:24 -05:00
carlfeberhard ee2c3cb82a Merge remote-tracking branch 'upstream/dev' into managers.history-contents 2016-01-21 14:58:35 -05:00
John Chilton 3217bc7832 Don't construct a DatatypesRegistry just for tests in galaxy.model.
Construct the model in the tests, this should cause galaxy.model to import much faster.
2016-01-21 14:31:41 +00:00
John Chilton 274af50792 Merge pull request #1331 from carlfeberhard/CORS
Core, CORS: allow (non-preflighted) CORS requests by echoing back the…
2016-01-15 10:44:50 -05:00
carlfeberhard 1a5bc43a80 CORS: try fixing tests again, this time by avoiding use of Configuration altogether 2016-01-14 16:45:28 -05:00
carlfeberhard 0d399f6919 CORS: cache and restore tempfile.tempdir when using test Configuration instances as it persists across tests and fails any tempfile related tests that follow, move test_config tests into test_webapp (cohesive subject v. ortho file struct) 2016-01-14 15:32:57 -05:00
carlfeberhard bd237cd586 History contents manager: add tests, fix order_by defaulting, clarify filter getter name 2016-01-14 12:10:53 -05:00
John Chilton 50a0db49d1 Extend discover_datasets sorting to allow numeric sorting...
... previously all sorting would be lexical which doesn't work well for like numeric sample identifiers for instance.

Test case included.
2016-01-14 13:22:37 +00:00
John Chilton 3d967dcb70 Allow sorting on keys other than filename in discover_outputs.
Namely dbkey, designation, and name.

With test case.
2016-01-14 13:22:36 +00:00
John Chilton 7be1ca0b0f Allow reverse sorting in discover_datasets. 2016-01-14 13:22:36 +00:00
John Chilton d64936325e Force consistent ordering of dynamic output collection. 2016-01-14 13:22:36 +00:00
John Chilton aeafcb1d6d Merge pull request #1504 from jmchilton/dev_merge_0
Merge release 16.01 into dev.
2016-01-14 07:46:53 -05:00