# HG changeset patch
# User iuc
# Date 1619515937 0
# Node ID 1544278c272e32aba47f844c0136fdbb7b021d86
# Parent 8a55d29c8fcf094da2d1b2abc7dc7bc3d5d08eaa
"planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/stacks2 commit 9a6c14bcb90c0b30c583294a993fac47504f4009"
diff -r 8a55d29c8fcf -r 1544278c272e macros.xml
--- a/macros.xml Thu Jul 16 07:28:45 2020 -0400
+++ b/macros.xml Tue Apr 27 09:32:17 2021 +0000
@@ -9,10 +9,9 @@
- 2.53
+ 2.55
0
-
- 18.01
+ 20.01
@@ -67,6 +66,7 @@
+
@@ -80,6 +80,7 @@
+
@@ -88,10 +89,13 @@
+
+
+
@@ -446,19 +450,19 @@
-
+
genetic_map_options['map_type'] and genetic_map_options['map_format']
- advanced_options['log_fst_comp'] and fstats_conditional['fstats']=='yes'
+ fstats_conditional['fstats']=='yes' or kernel_smoothing['options_kernel']['kernel'] in ['--k', '--smooth-fstats']
- advanced_options['log_fst_comp'] and fstats_conditional['fstats']=='yes'
+ fstats_conditional['fstats']=='yes' or kernel_smoothing['options_kernel']['kernel'] in ['--k', '--smooth-fstats']
- advanced_options['log_fst_comp'] and fstats_conditional['fstats']=='yes'
+ fstats_conditional['fstats']=='yes' or kernel_smoothing['options_kernel']['kernel'] in ['--k', '--smooth-fstats']
+
+ populations_output['gtf']
+
-
-
+
+
input_type['input_type_select'] == 'single'
-
+
input_type['input_type_select'] == 'paired'
-
+
capture and input_type['input_type_select'] == 'single'
-
+
capture and input_type['input_type_select'] == 'paired'
diff -r 8a55d29c8fcf -r 1544278c272e stacks_kmerfilter.xml
--- a/stacks_kmerfilter.xml Thu Jul 16 07:28:45 2020 -0400
+++ b/stacks_kmerfilter.xml Tue Apr 27 09:32:17 2021 +0000
@@ -107,7 +107,7 @@
-
+
not options_kmer_char['k_dist'] and not options_kmer_char['write_k_freq']
@@ -136,7 +136,7 @@
-
+
@@ -156,12 +156,12 @@
-
-
+
+
-
-
+
+
diff -r 8a55d29c8fcf -r 1544278c272e test-data/kmerfilter/Discarded1_0001.1.1.fq
diff -r 8a55d29c8fcf -r 1544278c272e test-data/kmerfilter/Discarded2_0001.2.2.fq
diff -r 8a55d29c8fcf -r 1544278c272e test-data/kmerfilter/Removed1_0001.1.1.fq
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test-data/kmerfilter/Removed1_0001.1.1.fq Tue Apr 27 09:32:17 2021 +0000
@@ -0,0 +1,16 @@
+@K00392:16:HJ2G2BBXX:7:1102:10825:462401 1:N:0:ATCACG
+GGACATTGGCTGCAGTACTCTGACCCTGGCCACCTCAACCTGTCTCTCTCGCACCGGAAACCTCCGATCCGCAGAAACATGAGCAACCCTACAGTTGACACACACAACAGTTTTCGACCGAAACTACACATTCCTCTGTCCCATTTCCTC
++
+--A-FF-F-