Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add GMM-Demux #5892

Merged
merged 33 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
585cc96
meta
mari-ga Jun 27, 2024
cbd4cc9
deleted white space
mari-ga Jun 27, 2024
f22b5e6
updates for comments
mari-ga Jul 26, 2024
1c4f130
Merge branch 'nf-core:master' into gmm-demux
mari-ga Jul 26, 2024
58c4afa
Merge remote-tracking branch 'refs/remotes/origin/gmm-demux' into gmm…
mari-ga Jul 26, 2024
76c3ee9
Merge branch 'nf-core:master' into gmm-demux
mari-ga Jul 29, 2024
96e73ae
added fixes to gmmdemux
mari-ga Jul 29, 2024
bae8d35
new structure including all outputs in a single folder
mari-ga Jul 30, 2024
8e557e3
white trailing space deleted
mari-ga Jul 30, 2024
b9a2a92
Merge branch 'master' into gmm-demux
mari-ga Jul 30, 2024
415544b
lint solved
mari-ga Jul 30, 2024
275fc71
Merge remote-tracking branch 'refs/remotes/origin/gmm-demux' into gmm…
mari-ga Jul 30, 2024
08cfac4
Fixed stub and changed default num of cells
mari-ga Jul 30, 2024
05ddd5a
added -o param to script
mari-ga Jul 30, 2024
34c9d10
Merge branch 'master' into gmm-demux
mari-ga Aug 1, 2024
d97b8dc
Edit spacing
SPPearce Aug 1, 2024
48f3e18
Add empty line
SPPearce Aug 1, 2024
c0c5978
added simple test, fix for argument
mari-ga Aug 1, 2024
ecbcd25
Merge remote-tracking branch 'refs/remotes/origin/gmm-demux' into gmm…
mari-ga Aug 1, 2024
09af95f
Merge branch 'master' into gmm-demux
mari-ga Aug 1, 2024
61b86fd
white space lint
mari-ga Aug 1, 2024
c8c0e14
Merge remote-tracking branch 'refs/remotes/origin/gmm-demux' into gmm…
mari-ga Aug 1, 2024
b6b2fc7
new snapshots
mari-ga Aug 5, 2024
7f89fee
Merge branch 'master' into gmm-demux
mari-ga Aug 5, 2024
3383e58
lint whitespace
mari-ga Aug 5, 2024
7aad7f5
Merge remote-tracking branch 'refs/remotes/origin/gmm-demux' into gmm…
mari-ga Aug 5, 2024
bbb528c
lint whitespace
mari-ga Aug 5, 2024
e12c48f
Merge branch 'master' into gmm-demux
mari-ga Aug 5, 2024
1fc2250
new snaps
mari-ga Aug 7, 2024
4243a2c
fix snap
mari-ga Aug 7, 2024
ab84680
Merge remote-tracking branch 'refs/remotes/origin/gmm-demux' into gmm…
mari-ga Aug 7, 2024
7cd4624
Merge branch 'master' into gmm-demux
mari-ga Aug 7, 2024
9ba5d7d
Merge branch 'master' into gmm-demux
mari-ga Aug 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added simple test, fix for argument
  • Loading branch information
mari-ga committed Aug 1, 2024
commit c0c5978a9f9985149ddd29ddce9587b2e281fcc6
6 changes: 3 additions & 3 deletions modules/nf-core/gmmdemux/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ process GMMDEMUX {
def args = task.ext.args ?: ''
def prefix = task.ext.prefix ?: "${meta.id}"
def skip = skip ? "--skip $skip" : ""
def examine_cells = examine ? "--extract $examine" : ""
def examine_cells = examine ? "--examine $examine" : ""
def VERSION = '0.2.2.3' // WARN: Version information not provided by tool on CLI. Please update version string below when bumping container versions.
def type_report = type_report ? "-f ." : "-s ."
def summary_rep = summary_report ? "-r summary_report_${prefix}" : ""
def summary_rep = summary_report ? "-r ${prefix}_summary_report.txt" : ""
"""
if [[ ${summary_report} == true ]]; then
cat /dev/null > summary_report_${prefix}.txt
cat /dev/null > ${prefix}_summary_report.txt
fi

GMM-demux $args \\
mari-ga marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
38 changes: 36 additions & 2 deletions modules/nf-core/gmmdemux/tests/main.nf.test
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,50 @@ nextflow_process {
name "Test Process GMMDEMUX"
script "../main.nf"
process "GMMDEMUX"
config "./nextflow.config"

tag "modules"
tag "modules_nfcore"
tag "gmmdemux"
tag "untar"


test("Standard_Multiome - 10x mtx - simple") {
setup {
run("UNTAR") {
script "modules/nf-core/untar/main.nf"
process {
"""
input[0] = Channel.of([ [],file(params.modules_testdata_base_path + "/genomics/homo_sapiens/10xgenomics/cellranger/hashing_demultiplexing/hto.tar.gz", checkIfExists: true) ])
"""
}
}
}
when {
process {
"""
input[0] = UNTAR.out.untar.map { meta, files -> [ [ id:'test', single_end:true ], files, "MS-11,MS-12" ] }
input[1] = false
input[2] = false
input[3] = []
input[4] = []
"""
}
}

then {
assertAll(
{ assert process.success },
{ assert path(process.out.matrix.get(0).get(1)).exists() },
{ assert path(process.out.barcodes.get(0).get(1)).exists() },
{ assert path(process.out.features.get(0).get(1)).exists() },
{ assert path(process.out.config_report.get(0).get(1)).exists() },

)
}
}

test("Standard_Multiome - 10x mtx") {
config "./nextflow.config"
setup {
run("UNTAR") {
script "modules/nf-core/untar/main.nf"
Expand Down Expand Up @@ -49,7 +83,7 @@ nextflow_process {
}

test("Standard_Multiome - 10x mtx - stub") {

config "./nextflow.config"
options "-stub"

when {
Expand Down