Commit Graph
34836 Commits
Author SHA1 Message Date
Dannon 8f5fc79db6 Merge pull request #6141 from jmchilton/rules_fix_10
[18.05] "Fix" rule builder to auto decompress uploaded files.
2018-05-15 16:53:12 -04:00
Dannon 5903edd4da Merge pull request #6109 from aloraine/update_bioviz_link
Update BioViz URL
2018-05-15 11:24:17 -04:00
John Chilton bf51c83526 Merge pull request #6140 from dannon/minor_typo
[18.05] Minor typo in rule builder
2018-05-15 10:57:53 -04:00
John Chilton 242d5459e1 "Fix" RuleBuilder to auto decompress compressed files.
Work arounds just aren't there yet.
2018-05-15 07:39:14 -04:00
John Chilton cdbae706e6 Respect auto_decompress in fetch API, synchronize upload APIs. 2018-05-15 07:39:14 -04:00
Dannon Baker 48de2ecf21 client-format 2018-05-15 07:32:35 -04:00
Dannon Baker a310b0a121 Fix minor typo in rule builder. 2018-05-15 07:32:02 -04:00
Dannon 3d6443b58b Merge pull request #6134 from jmchilton/rule_fixes_8
Improve data initialization of rule builder for long term support.
2018-05-15 07:30:56 -04:00
Dannon 076e1ddaec Merge pull request #6136 from jmchilton/rule_fixes_9
[18.05] More validation for rule builder.
2018-05-15 07:20:58 -04:00
John Chilton b4de30b5fc Small fixes for upload flags (auto_decompress, check_content, space_to_tab). 2018-05-15 06:28:54 -04:00
Dannon 5c036bc264 Merge pull request #6133 from jmchilton/rule_fixes_7
[18.05] Improve dialog message while waiting for rule builder job.
2018-05-14 17:14:30 -04:00
John Chilton e5ea32465a More validation for rule builder.
- Require a URL or FTP column for raw pasted data.
- Require list identifiers if creating collections.
- Require name in more scenerios that require a name.
2018-05-14 14:45:38 -04:00
Dannon b0d730fa76 Merge pull request #6130 from guerler/max_select2_length
[18.05] Limit select2 text label length to 100 characters
2018-05-14 13:21:50 -04:00
Aysam Guerler 9789aa7d63 Merge pull request #26 from dannon/max_select2_length
Fix a minor bug, a little bit of cleanup.
2018-05-14 13:19:27 -04:00
Dannon Baker c5ab87ee59 Fix repeated additions of the separator, define vars. 2018-05-14 13:07:13 -04:00
John Chilton 788ed8aa43 Improve data initialization of rule builder for long term support.
A mistake was made in the rush to rule-builder-all-the-stuffs - libraries, hdas, and FTP all initialized a different set of columns from the data (which is probably fine) but with no indication this was happening in the underlying rules (which is definitely not fine).

To understand why this was a mistake and see why in the long term this hurts reproducibility, take loading rules for HDAs from the history panel as an example. In the initial implementation it would pre-initialize two columns - one for "hid" and one for "name" - any rules that were generated from there would start with an implicit assumption of two columns. This is a problem because if someone saves some rules and we (Galaxy developers) decide later on that name tag should be in the initial list but HID doesn't make sense and make that change - we basically are breaking all existing rules to support a very logical change in behavior. Likewise, Galaxy produces a hash with last modified date and size for each FTP entry - this is data we have and could stick in the rule builder by default - but if we change that over time existing FTP rules will break.

It would be much more sustainable to instead include the initial column generation information in the initial rules generated - so that each of these modalities start in reality with an empty table and the initial set of rules describe what metadata to pull initial columns from. This way if you save a set of rules it will include the initial column choices, and if they are pasted in at some later point where columns are picked differently - the rules will still work because you are replacing the initial column definitions.

The initial rules implementation didn't have this concept of loading columns from metadata - but this was added to support loading existing identifiers as part of the "Apply Rules to Existing Collection" tool. This commit extends that idea to do the same thing (but with different columns) when loading data from HDAs, FTP, and data libraries.
2018-05-14 12:15:04 -04:00
John Chilton 8be2da03b5 Improve dialog message while waiting for rule builder job. 2018-05-14 12:05:40 -04:00
Dannon 19c5c7395e Merge pull request #6124 from martenson/fix-upload-colorstate
[18.05] fix upload status colors to work with bs4
2018-05-14 06:47:45 -04:00
Dannon 5f99db40d2 Merge pull request #6125 from jmchilton/upload_tests_3
[18.05] Fix missing upload tests.
2018-05-14 06:44:38 -04:00
guerler 616c1b971a Add a text label length limit for select2's used in the upload dialog
Reduce limit to a 100 characters

Match encapsulated values in title string
2018-05-12 08:54:41 -04:00
Martin Cech e2d516be2a Merge pull request #6128 from dannon/fix_cli_gies
[18.05] Fix GIE volume wrangling
2018-05-11 16:46:34 -04:00
John Chilton 35b96475a1 Missing upload tests.
Lots of upload and datatype behavior changes conflicting in 18.05 - these tests would have helped a lot.
2018-05-11 16:23:35 -04:00
Dannon Baker c76e21c030 Consistency in container_path : host_path 2018-05-11 16:17:15 -04:00
Dannon Baker 4c92aca576 Fix GIE volume usage 2018-05-11 16:09:42 -04:00
Martin Cech a4f99c8cc9 Merge pull request #6121 from jmchilton/rule_builder_error_better
[18.05] Fix for lack of feedback on rule builder job failures.
2018-05-11 14:21:34 -04:00
Martin Cech f06adba766 Merge pull request #6115 from jmchilton/dynamic_compressed_types_fix_5
[18.05] More compressed datatype sniffing fixes.
2018-05-11 12:52:59 -04:00
Martin Cech 3a4cc360a4 fix upload status colors to work with bs4 2018-05-11 12:37:39 -04:00
John Chilton 7b4b2a0f77 Fix for lack of feedback on rule builder job failures.
Present users with the job standard error and also check for binary sniffing problems and report them with a pretty message suggesting specifying a file type.
2018-05-11 12:17:35 -04:00
Nicola Soranzo f1eaaea24e Merge branch 'release_18.01' into release_18.05 2018-05-11 16:50:20 +01:00
Nicola Soranzo 3137d84ad7 Merge branch 'release_17.09' into release_18.01 2018-05-11 16:33:09 +01:00
John Chilton 67257da24b Fixes for compressed datatype fixes thanks to @nsoranzo. 2018-05-11 11:25:35 -04:00
Dannon Baker e26691244f Merge remote-tracking branch 'upstream/release_18.01' into release_18.05 2018-05-11 10:37:07 -04:00
Dannon 890b446974 Merge pull request #6119 from erasche/error-temp-lib-dl
[18.01] Showed up in sentry as referencing fname before assignment
2018-05-11 10:36:44 -04:00
Helena Rasche 4dedc900b5 Showed up in esntry as referencing fname before assignment 2018-05-11 15:56:20 +02:00
Marius van den Beek e25b086dc1 Merge pull request #6103 from nsoranzo/release_17.09_fix_2987
[17.09] Fix DynamicOptions.get_options() when loc file is missing
2018-05-11 15:37:52 +02:00
Dannon efc97a4400 Merge pull request #6054 from natefoo/genomespaceclient-downgrade
[18.05] Downgrade python-genomespaceclient to 0.2
2018-05-10 21:46:37 -04:00
John Chilton 2d103a09bc Fix sniff_compressed_dynamic_datatypes_default config option not propagating to upload tool.
Resolving the default when unspecified in the XML before writing out datatype confs fixes this. This makes this option always explicit in the datatypes conf that is shared with the upload tool.
2018-05-10 18:35:31 -04:00
John Chilton 8a58711e39 Remove validate_mode prop for sniffing, no longer needed with previous fixes.
This does undo an attempt that Nate made to auto sniff fastq.gz files when they can't be converted anyway, but that was kind of broken in its own way.

From Gitter:

jmchilton: natefoo "# Link mode can't decompress anyway, so enable sniffing for keep-compressed datatypes even when auto_decompress is enabled" Did you test this hack? I get the thought process but it seems like it results in uploaded fastq.gz files defaulting to fastqcssanger.gz? Maybe it didn't at some point though?

Nate Coraor: ummmmmmmmmmmm maybe probably not

John Chilton: I have four fixes for compressed datatypes that all fall apart because of this hack... can I just use the configured sniff order or do you want me to try to preserve this and write a test case

Nate Coraor: nah go ahead and de-hack

John Chilton: There is a good argument to be made for making the behavior more consistent anyway right? Cool thanks
2018-05-10 18:35:31 -04:00
John Chilton f52028f400 Fixes at least 4 more bugs related to sniffing of compressed datatypes.
- Incorrect parsing of default auto sniff flag value.
- Not respecting flag value when adding to dict of compressed sniffers.
- Not checking the right value when checking for compressed datatype instances to add to sniff order.
- Not filtering out the sniffers from being automatically added during the default stage of sniffer handling where all types with sniff are added at the end.

This last point is the most complicated. I added a hack with #6091 so that the compressed sniffers would only return True if in validation mode or explicitly enabled. I'm not convinced that approached worked and I'm definitely convinced it was a bad approach.

The better, cleaner approach is to just always let the sniffer return its truth regardless of validation mode or not and instead only add it to the list of sniffers if it should be enabled. This is what I was assuming would happen but I found this method append_to_sniff_order that was adding sniffers back in that I didn't want added.
2018-05-10 18:35:26 -04:00
Nicola Soranzo 8ca8ead4e5 Merge pull request #6111 from jmchilton/dynamic_compressed_types_fix_4
[18.05] Fix matches_any() checks for dynamic compressed types.
2018-05-10 22:31:18 +01:00
John Chilton 148d56a9c9 Many more matches_any tests, better categorization of them with comments.
Some of these suggested by @nsoranzo.
2018-05-10 14:17:41 -04:00
Dannon b6a22584aa Merge pull request #6112 from guerler/fix_hda_access
[18.05] Encode dataset ids when loading trackster visualizations
2018-05-10 11:49:44 -04:00
Nicola Soranzo b7f26be45f Merge pull request #6095 from jmchilton/fix_double_test
[18.05] Fix parsing last argument when running functional tests.
2018-05-10 15:22:01 +01:00
guerler ba1f369e2f Encode dataset ids when loading trackster visualizations 2018-05-10 10:16:14 -04:00
John Chilton 9bc73824a5 [18.05] Fix matches_any() checks for dynamic compressed types.
See huge conversation on #6093.
2018-05-10 09:47:53 -04:00
Aysam Guerler fa4d7b49a7 Merge pull request #6075 from dannon/workflow_building_mode
[18.05] Respect workflow_building_modes.ENABLED in workflow manager's to_dict.
2018-05-10 08:22:13 -04:00
Nicola Soranzo ef7d90a3de Merge branch 'release_18.01' into release_18.05 2018-05-10 10:30:04 +01:00
Ann Loraine ea22750604 Change BioViz URL to http://bioviz.org/galaxy.html from http://bioviz.org/igb/galaxy.html 2018-05-09 17:19:14 -04:00
Martin Cech 63abfd657a Merge pull request #6101 from jmchilton/more_conversion_fixes
[18.05] Add file missing file required for converting bz2 compressed files.
2018-05-09 14:54:32 -04:00
Martin Cech 9ef3449f17 Merge pull request #6102 from dannon/sentry_add_type_tag
[18.05] Set the level for SLOREQs to 'warning'
2018-05-09 13:00:17 -04:00