Merge pull request #496 from Kevin-Brockers/adapt_local_modules

Adapt local module to nf-core standard

Author: JoseEspinosa

CHANGELOG.md

@@ -18,6 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [[#484](https://github.com/nf-core/chipseq/issues/484)] - Bulk, updated of modules and subworkflows.
 - [[#489](https://github.com/nf-core/chipseq/issues/489)] - Replace deprecated `CUSTOM_GETCHROMSIZES` with `SAMTOOLS_FAIDX`.
 - [[PR #493](https://github.com/nf-core/chipseq/pull/493)] - Follow up to #487.
+- [[PR #493](https://github.com/nf-core/chipseq/pull/493)] - Follow up to #487.
+- [[#492](https://github.com/nf-core/chipseq/issues/492), [#417](https://github.com/nf-core/chipseq/issues/417)] - Refactor local modules to nf-core standard.
 
 ### Parameters
 
@@ -55,10 +57,9 @@ the last release have been listed below for reference.
 | r-tidyverse                 | 1.3.0       | 2.0.0       |
 | bioconductor-complexheatmap | 2.6.2       | 2.26.1      |
 | star                        | 2.6.1d      | 2.7.11b     |
-
-> **NB:** Dependency has been **updated** if both old and new version information is present.
-> **NB:** Dependency has been **added** if just the new version information is present.
-> **NB:** Dependency has been **removed** if version information isn't present.
+| python                      | 3.8.3       | 3.12.12     |
+| multiqc                     | 1.25.1      | 1.33        |
+|                             |             |             |
 
 ## [[2.1.0](https://github.com/nf-core/chipseq/releases/tag/2.1.0)] - 2024-10-07
 

main.nf

@@ -66,7 +66,6 @@ workflow NFCORE_CHIPSEQ {
         params.chromap_index,
         params.star_index,
     )
-    ch_versions = ch_versions.mix(PREPARE_GENOME.out.versions)
 
     //
     // WORKFLOW: Run nf-core/chipseq workflow

modules/local/annotate_boolean_peaks/environment.yml

@@ -0,0 +1,7 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/environment-schema.json
+channels:
+  - conda-forge
+  - bioconda
+dependencies:
+  - conda-forge::sed=4.7

modules/local/annotate_boolean_peaks/main.nf

@@ -2,7 +2,7 @@ process ANNOTATE_BOOLEAN_PEAKS {
     tag "$meta.id"
     label 'process_low'
 
-    conda "conda-forge::sed=4.7"
+    conda "${moduleDir}/environment.yml"
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
         'docker.io/library/ubuntu:20.04' }"
@@ -12,17 +12,12 @@ process ANNOTATE_BOOLEAN_PEAKS {
 
     output:
     path '*.boolean.annotatePeaks.txt', emit: annotate_peaks_txt
-    path "versions.yml"               , emit: versions
+    tuple val("${task.process}"), val('sed'), eval("sed --version 2>&1 | sed '1!d;s/^.*) //'"), topic: versions, emit: versions_sed
 
     script:
     def prefix = task.ext.prefix ?: "${meta.id}"
     """
     cut -f2- ${homer_peaks} | awk 'NR==1; NR > 1 {print \$0 | "sort -T '.' -k1,1 -k2,2n"}' | cut -f6- > tmp.txt
     paste $boolean_txt tmp.txt > ${prefix}.boolean.annotatePeaks.txt
-
-    cat <<-END_VERSIONS > versions.yml
-    "${task.process}":
-        sed: \$(echo \$(sed --version 2>&1) | sed 's/^.*GNU sed) //; s/ .*\$//')
-    END_VERSIONS
     """
 }

modules/local/deseq2_qc/environment.yml

@@ -0,0 +1,15 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/environment-schema.json
+channels:
+  - conda-forge
+  - bioconda
+dependencies:
+  - conda-forge::r-base
+  - bioconda::bioconductor-deseq2
+  - bioconda::bioconductor-biocparallel
+  - bioconda::bioconductor-tximport
+  - bioconda::bioconductor-complexheatmap
+  - conda-forge::r-optparse
+  - conda-forge::r-ggplot2
+  - conda-forge::r-rcolorbrewer
+  - conda-forge::r-pheatmap

modules/local/deseq2_qc/main.nf

@@ -4,7 +4,7 @@ process DESEQ2_QC {
 
     // (Bio)conda packages have intentionally not been pinned to a specific version
     // This was to avoid the pipeline failing due to package conflicts whilst creating the environment when using -profile conda
-    conda "conda-forge::r-base bioconda::bioconductor-deseq2 bioconda::bioconductor-biocparallel bioconda::bioconductor-tximport bioconda::bioconductor-complexheatmap conda-forge::r-optparse conda-forge::r-ggplot2 conda-forge::r-rcolorbrewer conda-forge::r-pheatmap"
+    conda "${moduleDir}/environment.yml"
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'https://depot.galaxyproject.org/singularity/mulled-v2-8849acf39a43cdd6c839a369a74c0adc823e2f91:ab110436faf952a33575c64dd74615a84011450b-0' :
         'biocontainers/mulled-v2-8849acf39a43cdd6c839a369a74c0adc823e2f91:ab110436faf952a33575c64dd74615a84011450b-0' }"
@@ -24,7 +24,8 @@ process DESEQ2_QC {
     path "*sample.dists_mqc.tsv", optional:true, emit: dists_multiqc
     path "*.log"                , optional:true, emit: log
     path "size_factors"         , optional:true, emit: size_factors
-    path "versions.yml"         , emit: versions
+    tuple val("${task.process}"), val('R'), eval('R --version | sed "1!d; s/.*version //; s/ .*//"'), topic: versions, emit: versions_r
+    tuple val("${task.process}"), val('DESeq2'), eval('Rscript -e "library(DESeq2); cat(as.character(packageVersion(\'DESeq2\')))"'), topic: versions, emit: versions_deseq2
 
     when:
     task.ext.when == null || task.ext.when
@@ -49,11 +50,5 @@ process DESEQ2_QC {
     sed 's/deseq2_clustering/deseq2_clustering_${task.index}/g' <$deseq2_clustering_header >tmp.txt
     sed -i -e 's/DESeq2 /${meta.id} DESeq2 /g' tmp.txt
     cat tmp.txt ${prefix}.sample.dists.txt > ${prefix}.sample.dists_mqc.tsv
-
-    cat <<-END_VERSIONS > versions.yml
-    "${task.process}":
-        r-base: \$(echo \$(R --version 2>&1) | sed 's/^.*R version //; s/ .*\$//')
-        bioconductor-deseq2: \$(Rscript -e "library(DESeq2); cat(as.character(packageVersion('DESeq2')))")
-    END_VERSIONS
     """
 }

modules/local/gtf2bed/environment.yml

@@ -0,0 +1,7 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/environment-schema.json
+channels:
+  - conda-forge
+  - bioconda
+dependencies:
+  - conda-forge::perl=5.26.2

modules/local/gtf2bed/main.nf

@@ -2,7 +2,7 @@ process GTF2BED {
     tag "$gtf"
     label 'process_low'
 
-    conda "conda-forge::perl=5.26.2"
+    conda "${moduleDir}/environment.yml"
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'https://depot.galaxyproject.org/singularity/perl:5.26.2':
         'biocontainers/perl:5.26.2' }"
@@ -12,7 +12,7 @@ process GTF2BED {
 
     output:
     path '*.bed'       , emit: bed
-    path "versions.yml", emit: versions
+    tuple val("${task.process}"), val('perl'), eval("perl -V:version | sed \"s/version='//; s/';//\""), topic:versions, emit: versions_perl
 
     when:
     task.ext.when == null || task.ext.when
@@ -22,10 +22,5 @@ process GTF2BED {
     gtf2bed \\
         $gtf \\
         > ${gtf.baseName}.bed
-
-    cat <<-END_VERSIONS > versions.yml
-    "${task.process}":
-        perl: \$(echo \$(perl --version 2>&1) | sed 's/.*v\\(.*\\)) built.*/\\1/')
-    END_VERSIONS
     """
 }

modules/local/igv/environment.yml

@@ -0,0 +1,7 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/environment-schema.json
+channels:
+  - conda-forge
+  - bioconda
+dependencies:
+  - conda-forge::python=3.12.3

modules/local/igv/main.nf

@@ -3,10 +3,10 @@
  */
 process IGV {
 
-    conda "conda-forge::python=3.8.3"
+    conda "${moduleDir}/environment.yml"
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/python:3.8.3':
-        'biocontainers/python:3.8.3' }"
+        'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/62/622d8944750bc95bb56b4c3ed5c2b827e677c14073d48a5231e0f2bec0718add/data' :
+        'community.wave.seqera.io/library/python:3.12.12--74abbf3898230efd' }"
 
     input:
     val aligner_dir
@@ -21,7 +21,7 @@ process IGV {
     path "*files.txt"  , emit: txt
     path "*.xml"       , emit: xml
     path fasta         , emit: fasta
-    path "versions.yml", emit: versions
+    tuple val("${task.process}"), val('python'), eval("python --version | sed 's/Python //'"), topic: versions, emit: versions_python
 
     when:
     task.ext.when == null || task.ext.when
@@ -42,10 +42,5 @@ process IGV {
 
     cat *.igv.txt > igv_files_orig.txt
     igv_files_to_session.py igv_session.xml igv_files_orig.txt replace_paths.txt ../../genome/${fasta.getName()} --path_prefix '../../'
-
-    cat <<-END_VERSIONS > versions.yml
-    "${task.process}":
-        python: \$(python --version | sed 's/Python //g')
-    END_VERSIONS
     """
 }