From 06fa1219e57fe1b2154e5ec966ddbff3e1c7daba Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Tue, 29 Oct 2024 17:37:07 +0100 Subject: [PATCH] Fix a join bug (#6899) * Fix a join bug * Exclude Conda from tests --- .github/workflows/test.yml | 2 ++ subworkflows/nf-core/fasta_newick_epang_gappa/main.nf | 2 +- .../nf-core/fasta_newick_epang_gappa/tests/main.nf.test | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5d19d07ba69..c6c9ae459c5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -654,6 +654,8 @@ jobs: path: subworkflows/nf-core/fastq_align_bamcmp_bwa - profile: conda path: subworkflows/nf-core/fastq_align_bwa + - profile: conda + path: subworkflows/nf-core/fasta_newick_epang_gappa env: NXF_ANSI_LOG: false NFTEST_VER: "0.9.0" diff --git a/subworkflows/nf-core/fasta_newick_epang_gappa/main.nf b/subworkflows/nf-core/fasta_newick_epang_gappa/main.nf index b3d9d15e96a..28016014f94 100644 --- a/subworkflows/nf-core/fasta_newick_epang_gappa/main.nf +++ b/subworkflows/nf-core/fasta_newick_epang_gappa/main.nf @@ -139,7 +139,7 @@ workflow FASTA_NEWICK_EPANG_GAPPA { GAPPA_ASSIGN ( EPANG_PLACE.out.jplace .map { [ [ id:it[0].id ], it[1] ] } - .join( ch_pp_data.map { [ it.meta, it.data.taxonomy ] } ) + .join( ch_pp_data.map { [ [ id: it.meta.id ], it.data.taxonomy ] } ) ) ch_versions = ch_versions.mix(GAPPA_ASSIGN.out.versions) diff --git a/subworkflows/nf-core/fasta_newick_epang_gappa/tests/main.nf.test b/subworkflows/nf-core/fasta_newick_epang_gappa/tests/main.nf.test index edf1679ef59..619d90c256f 100644 --- a/subworkflows/nf-core/fasta_newick_epang_gappa/tests/main.nf.test +++ b/subworkflows/nf-core/fasta_newick_epang_gappa/tests/main.nf.test @@ -32,7 +32,7 @@ nextflow_workflow { """ input[0] = Channel.of( [ - meta: [ id: "hmmer" ], + meta: [ id: "hmmer", min_bitscore: 4 ], data: [ alignmethod: 'hmmer', queryseqfile: file("https://github.com/nf-core/test-datasets/raw/phyloplace/testdata/PF14720_3_sequences.faa", checkIfExists: true),