From cc8439a167e2ae4a5bad13dbf080bca7ab559540 Mon Sep 17 00:00:00 2001 From: JIANHONG OU Date: Thu, 27 May 2021 13:09:28 -0400 Subject: [PATCH] Pairtools flip (#520) * add software/pairtools * create a branch for pairtools/flip * fix the issue of PG line in output * remove custom code from test. Co-authored-by: Harshil Patel --- software/pairtools/flip/functions.nf | 68 ++++++++++++++++++++++++++ software/pairtools/flip/main.nf | 42 ++++++++++++++++ software/pairtools/flip/meta.yml | 43 ++++++++++++++++ tests/config/pytest_software.yml | 4 ++ tests/software/pairtools/flip/main.nf | 14 ++++++ tests/software/pairtools/flip/test.yml | 7 +++ 6 files changed, 178 insertions(+) create mode 100644 software/pairtools/flip/functions.nf create mode 100644 software/pairtools/flip/main.nf create mode 100644 software/pairtools/flip/meta.yml create mode 100644 tests/software/pairtools/flip/main.nf create mode 100644 tests/software/pairtools/flip/test.yml diff --git a/software/pairtools/flip/functions.nf b/software/pairtools/flip/functions.nf new file mode 100644 index 00000000..da9da093 --- /dev/null +++ b/software/pairtools/flip/functions.nf @@ -0,0 +1,68 @@ +// +// Utility functions used in nf-core DSL2 module files +// + +// +// Extract name of software tool from process name using $task.process +// +def getSoftwareName(task_process) { + return task_process.tokenize(':')[-1].tokenize('_')[0].toLowerCase() +} + +// +// Function to initialise default values and to generate a Groovy Map of available options for nf-core modules +// +def initOptions(Map args) { + def Map options = [:] + options.args = args.args ?: '' + options.args2 = args.args2 ?: '' + options.args3 = args.args3 ?: '' + options.publish_by_meta = args.publish_by_meta ?: [] + options.publish_dir = args.publish_dir ?: '' + options.publish_files = args.publish_files + options.suffix = args.suffix ?: '' + return options +} + +// +// Tidy up and join elements of a list to return a path string +// +def getPathFromList(path_list) { + def paths = path_list.findAll { item -> !item?.trim().isEmpty() } // Remove empty entries + paths = paths.collect { it.trim().replaceAll("^[/]+|[/]+\$", "") } // Trim whitespace and trailing slashes + return paths.join('/') +} + +// +// Function to save/publish module results +// +def saveFiles(Map args) { + if (!args.filename.endsWith('.version.txt')) { + def ioptions = initOptions(args.options) + def path_list = [ ioptions.publish_dir ?: args.publish_dir ] + if (ioptions.publish_by_meta) { + def key_list = ioptions.publish_by_meta instanceof List ? ioptions.publish_by_meta : args.publish_by_meta + for (key in key_list) { + if (args.meta && key instanceof String) { + def path = key + if (args.meta.containsKey(key)) { + path = args.meta[key] instanceof Boolean ? "${key}_${args.meta[key]}".toString() : args.meta[key] + } + path = path instanceof String ? path : '' + path_list.add(path) + } + } + } + if (ioptions.publish_files instanceof Map) { + for (ext in ioptions.publish_files) { + if (args.filename.endsWith(ext.key)) { + def ext_list = path_list.collect() + ext_list.add(ext.value) + return "${getPathFromList(ext_list)}/$args.filename" + } + } + } else if (ioptions.publish_files == null) { + return "${getPathFromList(path_list)}/$args.filename" + } + } +} diff --git a/software/pairtools/flip/main.nf b/software/pairtools/flip/main.nf new file mode 100644 index 00000000..efde6f55 --- /dev/null +++ b/software/pairtools/flip/main.nf @@ -0,0 +1,42 @@ +// Import generic module functions +include { initOptions; saveFiles; getSoftwareName } from './functions' + +params.options = [:] +options = initOptions(params.options) + +process PAIRTOOLS_FLIP { + tag "$meta.id" + label 'process_low' + publishDir "${params.outdir}", + mode: params.publish_dir_mode, + saveAs: { filename -> saveFiles(filename:filename, options:params.options, publish_dir:getSoftwareName(task.process), meta:meta, publish_by_meta:['id']) } + + conda (params.enable_conda ? "bioconda::pairtools=0.3.0" : null) + if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) { + container "https://depot.galaxyproject.org/singularity/pairtools:0.3.0--py37hb9c2fc3_5" + } else { + container "quay.io/biocontainers/pairtools:0.3.0--py37hb9c2fc3_5" + } + + input: + tuple val(meta), path(sam) + path chromsizes + + output: + tuple val(meta), path("*.flip.gz"), emit: flip + path "*.version.txt" , emit: version + + script: + def software = getSoftwareName(task.process) + def prefix = options.suffix ? "${meta.id}${options.suffix}" : "${meta.id}" + """ + pairtools \\ + flip \\ + -c $chromsizes \\ + $options.args \\ + -o ${prefix}.flip.gz \\ + $sam + + echo \$(pairtools --version 2>&1) | sed 's/pairtools.*version //' > ${software}.version.txt + """ +} diff --git a/software/pairtools/flip/meta.yml b/software/pairtools/flip/meta.yml new file mode 100644 index 00000000..50badc23 --- /dev/null +++ b/software/pairtools/flip/meta.yml @@ -0,0 +1,43 @@ +name: pairtools_flip +description: Flip pairs to get an upper-triangular matrix +keywords: + - flip +tools: + - pairtools: + description: CLI tools to process mapped Hi-C data + homepage: http://pairtools.readthedocs.io/ + documentation: http://pairtools.readthedocs.io/ + tool_dev_url: https://github.com/mirnylab/pairtools + doi: "" + licence: ['MIT'] + +input: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - sam: + type: file + description: pair file + - chromsizes: + type: file + description: chromosome size file + +output: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - version: + type: file + description: File containing software version + pattern: "*.{version.txt}" + - flip: + type: file + description: output file of flip + pattern: "*.{flip.gz}" + +authors: + - "@jianhong" diff --git a/tests/config/pytest_software.yml b/tests/config/pytest_software.yml index d05adada..85a42f4b 100644 --- a/tests/config/pytest_software.yml +++ b/tests/config/pytest_software.yml @@ -455,6 +455,10 @@ optitype: - software/optitype/** - tests/software/optitype/** +pairtools/flip: + - software/pairtools/flip/** + - tests/software/pairtools/flip/** + pairtools/dedup: - software/pairtools/dedup/** - tests/software/pairtools/dedup/** diff --git a/tests/software/pairtools/flip/main.nf b/tests/software/pairtools/flip/main.nf new file mode 100644 index 00000000..84b5a1ba --- /dev/null +++ b/tests/software/pairtools/flip/main.nf @@ -0,0 +1,14 @@ +#!/usr/bin/env nextflow + +nextflow.enable.dsl = 2 + +include { PAIRTOOLS_FLIP } from '../../../../software/pairtools/flip/main.nf' addParams( options: [:] ) + +workflow test_pairtools_flip { + + input = [ [ id:'test', single_end:false ], // meta map + file("https://raw.githubusercontent.com/open2c/pairtools/master/tests/data/mock.4flip.pairs", checkIfExists: true) ] + sizes = file("https://raw.githubusercontent.com/open2c/pairtools/master/tests/data/mock.chrom.sizes", checkIfExists:true) + + PAIRTOOLS_FLIP ( input, sizes ) +} diff --git a/tests/software/pairtools/flip/test.yml b/tests/software/pairtools/flip/test.yml new file mode 100644 index 00000000..e4fb8d31 --- /dev/null +++ b/tests/software/pairtools/flip/test.yml @@ -0,0 +1,7 @@ +- name: pairtools flip test_pairtools_flip + command: nextflow run tests/software/pairtools/flip -entry test_pairtools_flip -c tests/config/nextflow.config + tags: + - pairtools/flip + - pairtools + files: + - path: output/pairtools/test.flip.gz