Commit Graph
35122 Commits
Author SHA1 Message Date
Dannon Baker d7959568f8 Merge branch 'release_18.01' into release_18.05 2018-08-06 20:19:18 -04:00
Dannon 6d9df51f36 Merge pull request #6570 from mvdbeek/fix_auto_labelling_and_output_recovery
[18.01] Use subworkflow index when setting auto-label
2018-08-06 20:14:56 -04:00
Marius van den Beek 6c7b9a3c7d Merge pull request #6532 from dannon/fix-dataset-copy-tags
[18.05] Fix dataset copy tags
2018-08-06 21:14:16 +02:00
mvdbeek 21fd74e640 Use subworkflow index when setting auto-label
Previously this would reference the parent workflow index, while the
get_data module would use the subworkflow index. This means defining
workflows worked fine, but executing would fail when trying to find the
output to replace. Using the subworkflow index here seems like the
correct thing to do.

Fixes https://github.com/galaxyproject/galaxy/issues/6560
2018-08-06 15:55:27 +02:00
mvdbeek ba47188f5e Introduce test for auto-labelling subworkflow workflow outputs 2018-08-06 15:55:27 +02:00
Dannon Baker 9630699c21 Simpler, more targeted fix for copy datasets dialog tag copies (will refactor in dev) 2018-07-31 16:04:18 -04:00
Dannon 66e74d0e47 Merge pull request #6542 from jmchilton/1805_fix_empty_handling_rule_on_backend
[18.05] Fix "filter empty" rule in Python rule handling framework.
2018-07-30 15:35:58 -04:00
Björn Grüning 0a9010156e Merge pull request #6538 from jmchilton/tool_output_io
[18.01] Fix to_dict with io_details=True for tools with collection outputs.
2018-07-26 22:26:41 +02:00
Dannon a88bf0a2be Merge pull request #6264 from mvdbeek/allow_optional_and_invalid_parameter_values
[18.05] Allow invalid optional param values for tools profile versions < 18.09
2018-07-26 11:14:51 -04:00
John Chilton 5f19b8752d Fix empty handling rule. 2018-07-26 09:52:07 -04:00
John Chilton 9794d835e5 Fix to_dict with io_details=True for tools with collection outputs.
Fixes #6537 and includes a test case.
2018-07-25 12:32:38 -04:00
John Chilton 50b3418539 Merge pull request #6528 from nsoranzo/release_18.05_fix_CONVERTER_bam_to_bigwig_0
[18.05] Fix warning in CONVERTER_bam_to_bigwig_0 and CONVERTER_sam_to_bigwig_0
2018-07-23 11:30:07 -04:00
Nicola Soranzo a8b9899681 Fix warning in CONVERTER_bam_to_bigwig_0 and CONVERTER_sam_to_bigwig_0
Since v2.27.0 (see
https://github.com/arq5x/bedtools2/commit/4d188435777cfbd6ada7394ee78fde37f07c9a75 ),
`bedtools genomecov` emits this warning:
```
*****
*****WARNING: Genome (-g) files are ignored when BAM input is provided.
*****
```
if both `-ibam` and `-g` option are specified, which causes the converters to
always fail.

Also:
- Add `detect_errors="aggressive"` to `<command/>` to prevent future warnings from
  creating other issues.
- Fix input format in `CONVERTER_sam_to_bigwig_0`.
2018-07-23 14:23:43 +01:00
Martin Cech ef702e1458 Merge pull request #6510 from nsoranzo/release_18.05_backport_29f8e29b0bf5d50c0b735aa707d2a61623cc805b
[18.05] Fix infinite loop in uploads
2018-07-17 14:52:26 -04:00
John Chilton 7b8e4f9e74 Fix empty datatypes. 2018-07-17 17:56:19 +01:00
Marius van den Beek fd33c5c6d6 Merge pull request #6497 from martenson/backport-takadonet
[18.05] backport ftp purge fix
2018-07-13 11:51:09 +02:00
Nicola Soranzo dfc996c8d6 Merge branch 'release_18.01' into release_18.05 2018-07-13 01:01:13 +01:00
takadonet 4b0ae30a83 Added fix to ensure that original ftp files that have been uploaded are purged if set in galaxy.yml with flag ftp_upload_purge. Address issue #6492 2018-07-12 16:35:35 -04:00
John Chilton 20565a2b85 Merge pull request #6375 from dannon/sentry_transport_fix
[18.05] Specify standard HTTPTransport for Sentry
2018-07-11 13:34:54 -04:00
John Chilton 93fc3a6350 Merge pull request #6369 from guerler/pages
[18.05] Make sure that the workflow step has a proper state available
2018-07-11 13:33:43 -04:00
John Chilton 23666c94a2 Merge pull request #6477 from natefoo/backport-pr-6351
[18.01] Fix the --log-file option in the job handlers
2018-07-11 09:29:22 -04:00
Devon Ryan bc95f25636 Fix the --log-file option in the job handlers
(cherry picked from commit 97c344a17a)
2018-07-09 12:46:22 -04:00
Nicola Soranzo 3fe88a9bfe Merge pull request #6465 from dannon/backport-gie-static-again
[18.05] Backport of IE static url fix (to actual 18.05)
2018-07-05 08:56:58 +01:00
thobalose 0c97d4ff5c GIE static url; https://github.com/galaxyproject/galaxy/issues/6459 2018-07-04 11:33:32 -04:00
Martin Cech 39d7cf2eb7 Merge pull request #6433 from jmchilton/hack_6299
[18.05] decode potential encoded id
2018-07-01 16:14:13 -07:00
John Chilton 6654a83752 Hack around #6299. 2018-07-01 10:01:57 -07:00
Nicola Soranzo e0c269291a Merge branch 'release_18.01' into release_18.05 2018-06-23 00:04:32 +01:00
Martin Cech 36706e9eb3 Merge pull request #6385 from dannon/revert-baiconverter-removal
[18.01] Revert "Remove bam to bai converter"
2018-06-22 13:08:13 -05:00
mvdbeek 5f24794efd Add basic .bai datatype 2018-06-22 19:50:43 +02:00
Dannon Baker fa2b6baef7 Revert "Remove bam to bai converter"
This reverts commit 7e2727bc0a.
2018-06-22 13:22:51 -04:00
Dannon 22d383c398 Merge pull request #6378 from guerler/commaseperror
[18.05] Comma-separate tool names in missing tools error message
2018-06-22 08:24:22 -04:00
guerler 9967639bac Comma-separate tool names in missing tools error message 2018-06-22 00:30:17 -04:00
Nate Coraor d28ab2a4f3 Merge pull request #6377 from martenson/catch-sanitization-faults
[18.05] Catch sanitization faults
2018-06-21 18:47:54 -04:00
guerler f94a073e86 Make sure that the workflow step has a proper state available 2018-06-21 16:44:26 -04:00
Martin Cech 572f38d1fb move the sanitization to the try/except block
as it may fail (and it did, on Main)
2018-06-21 15:44:05 -04:00
Dannon Baker 603b2365b6 Force standard HTTPTransport for sentry -- this plays nicer with a wider array of uwsgi configurations 2018-06-21 10:25:42 -04:00
Martin Cech 6d5be41b32 Merge pull request #6366 from jmchilton/job_log_bug
[18.05] Fix small bug in logging output name in job finish.
2018-06-20 21:16:18 -05:00
Nicola Soranzo d0a0fa8319 Merge branch 'release_18.01' into release_18.05 2018-06-20 22:43:33 +01:00
John Chilton c6403acd0f Fix logging bug. 2018-06-20 15:37:29 -04:00
Dannon Baker bcf105cbb3 Client build. 2018-06-20 10:11:31 -04:00
Dannon Baker b8536c2005 Merge remote-tracking branch 'jmchilton/collection_fixes' into release_18.05 2018-06-20 10:10:17 -04:00
Dannon 128a1731e4 Merge pull request #6360 from guerler/legacy_modal_scrolling
[18.05] Fix size handling in legacy modal view
2018-06-20 10:04:58 -04:00
mvdbeek 333d660556 Recover the correct DataCollectionToolParameter when checking if a collection is being mapped over 2018-06-20 09:54:42 -04:00
mvdbeek 5e32d78aa7 Consider mapping-over when picking collection_type for dynamically discovered collections 2018-06-20 09:54:41 -04:00
mvdbeek 647ba8531a Add test tool and workflow for mapping over with mapping output
This doesn't quite work because of the dynamic output collection,
which fails with:

```
galaxy.tools.parameters.output_collect DEBUG 2018-06-06 18:40:38,784 (3) Add dynamic collection datasets to history for output [reverse] (171.970 ms)
galaxy.tools.parameters.output_collect ERROR 2018-06-06 18:40:38,839 Problem gathering output collection.
Traceback (most recent call last):
  File "/Users/mvandenb/src/galaxy/lib/galaxy/tools/parameters/output_collect.py", line 340, in collect_dynamic_outputs
    collection_builder.populate()
  File "/Users/mvandenb/src/galaxy/lib/galaxy/dataset_collections/builder.py", line 88, in populate
    elements = self.build_elements()
  File "/Users/mvandenb/src/galaxy/lib/galaxy/dataset_collections/builder.py", line 59, in build_elements
    new_elements[identifier] = element.build()
AttributeError: 'HistoryDatasetAssociation' object has no attribute 'build'
```

This seems to happen because the inner collection is wrongly detected as
nested. In general I doubt that mapping over colleciton output works
with dynamically discovered output collections.
2018-06-20 09:54:40 -04:00
mvdbeek f5aec1cdf1 Fix inferring output structure when mapping over
Previously this would have always generated `list:list` structures,
even when the input is a list:pair. I'm not 100% convinced
this is correct, but this seems to work.
2018-06-20 09:54:38 -04:00
mvdbeek b53d2ae381 Fix can_map_over for mapping over paired inputs
We'd only try mapping over the first collection type description
otherwise. I suppose we didn't notice because the first type is `list`
and therefore much more common. Noticed this while working on https://github.com/galaxyproject/galaxy/pull/5640.
2018-06-20 09:54:37 -04:00
mvdbeek 7cfbb032f6 Break test by adding "list" to collection_type
This will break tests trying to map over list:pair collections,
for instance test_extract_workflows_with_dataset_collections.
2018-06-20 09:54:36 -04:00
mvdbeek 9e3de244d7 Fix mapping list over multidata input 2018-06-20 09:54:02 -04:00
mvdbeek 6b7ee55bac Test list collection mapping over multidata input 2018-06-20 09:54:01 -04:00