diff --git a/tools/varvamp/macros.xml b/tools/varvamp/macros.xml index cc2b54039f8..673a98c00c4 100644 --- a/tools/varvamp/macros.xml +++ b/tools/varvamp/macros.xml @@ -1,7 +1,7 @@ - 1.2.0 - 1 + 1.2.1 + 0 diff --git a/tools/varvamp/test-data/ambiguous_consensus.fasta b/tools/varvamp/test-data/ambiguous_consensus.fasta index 520c4a17c37..7d986a53150 100644 --- a/tools/varvamp/test-data/ambiguous_consensus.fasta +++ b/tools/varvamp/test-data/ambiguous_consensus.fasta @@ -1,2 +1,2 @@ ->ambiguous_consensus +>AMPLICON_consensus tatcccgtrtycaractgayatccttattaayytgatgcaaccycgrcagcttgtkttccgrccygaagtyytstggaaycayccgatccagcgrgtyatacataatgagctggagcartactgccgwgcycgygctggycgytgyctkgargtkggsgcycayccaagatcyatyaatgayaacccyaatgtyytgcaccggtgcttyctycgcccggtyggdagagaygtmcagcgytggtaytcygccccsacycgyggyccagcggcyaaytgccgccgytcygcgctacgyggyytgccccctgtcgaycgyacmtaytgcttcgacgggttytcccgctgcgcytttgccgctgagacyggratygctttataytcactrcatgacctytggccytcggaygtygcggaggcya diff --git a/tools/varvamp/varvamp.xml b/tools/varvamp/varvamp.xml index cf329fcb98d..0a077f1ad15 100644 --- a/tools/varvamp/varvamp.xml +++ b/tools/varvamp/varvamp.xml @@ -8,14 +8,17 @@ varvamp - primer3-py + primer3-py seqfold + python + coreutils varvamp --version results/primers_headerless.bed +#end if #if $mode.m_select == 'qpcr' and $mode.scheme_outputs and 'primer_seqs' in $mode.scheme_outputs: ## make the primer sequences fasta discoverable under the same name that is used in "single" mode && mv results/oligos.fasta results/primers.fasta #end if #if $mode.m_select == 'tiled' and $mode.scheme_outputs and 'primer_dimers' in $mode.scheme_outputs: ## ensure the unsolvable_primer_dimers.tsv file, which varVAMP creates only conditionally, exists in all cases, in which we try to discover it as an output - && cp -n dimers_fallback.tsv results/unsolvable_primer_dimers.tsv + && cp --update=none dimers_fallback.tsv results/unsolvable_primer_dimers.tsv #end if ]]> @@ -118,6 +126,7 @@ $line]]> + @@ -142,6 +151,7 @@ $line]]> + @@ -158,6 +168,7 @@ $line]]> + @@ -210,10 +221,10 @@ $line]]> mode['m_select'] == 'tiled' and mode['scheme_outputs'] and 'primer_seqs' in mode['scheme_outputs'] - - + + - + mode['scheme_outputs'] and 'primer_binding_sites' in mode['scheme_outputs'] @@ -344,13 +355,13 @@ $line]]> - + - +