Merge pull request #1359 from nf-core/revert_multiqc_workaround

Revert multiqc workaround
nf-core · Aug 22, 2024 · f6af6d9 · f6af6d9
2 parents 4a01a63 + 52de9f6
commit f6af6d9
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -114,6 +114,7 @@ Thank you to everyone else that has contributed by reporting bugs, enhancements
 - [PR #1355](https://github.com/nf-core/rnaseq/pull/1355) - Make all curves on subway map better looking, and all lines now have the same width
 - [PR #1357](https://github.com/nf-core/rnaseq/pull/1357) - Fix anchor issue in multiqc
 - [PR #1358](https://github.com/nf-core/rnaseq/pull/1358) - Update test profiles to restore a static URI for megatests
+- [PR #1359](https://github.com/nf-core/rnaseq/pull/1359) - Update MultiQC and revert unnecessary workaround
 
 ### Parameters
 

diff --git a/modules.json b/modules.json
@@ -92,7 +92,7 @@
                     },
                     "multiqc": {
                         "branch": "master",
-                        "git_sha": "878d2adbb911aa6e15c06a4d1e93d01bd6f26c74",
+                        "git_sha": "fb387b16025333f6d66b88d6c48c3719f47b1637",
                         "installed_by": ["modules"]
                     },
                     "picard/markduplicates": {

diff --git a/modules/nf-core/multiqc/environment.yml b/modules/nf-core/multiqc/environment.yml
diff --git a/modules/nf-core/multiqc/main.nf b/modules/nf-core/multiqc/main.nf
diff --git a/modules/nf-core/multiqc/tests/main.nf.test.snap b/modules/nf-core/multiqc/tests/main.nf.test.snap
diff --git a/workflows/rnaseq/assets/multiqc/multiqc_config.yml b/workflows/rnaseq/assets/multiqc/multiqc_config.yml
@@ -11,13 +11,13 @@ report_section_order:
   fail_strand_check-module:
     order: 5001
   # Preprocessing and pre-alignment QC
-  fastqc:
+  fastqc_raw:
     order: 4004
   cutadapt:
     order: 4003
   fastp:
     order: 4003
-  fastqc-1:
+  fastqc_trimmed:
     order: 4002
   # Alignment
   star:
@@ -98,13 +98,15 @@ run_modules:
 
 module_order:
   - fastqc:
+      anchor: "fastqc_raw"
       name: "FastQC (raw)"
       info: "This section of the report shows FastQC results before adapter trimming."
       path_filters:
         - "*_raw*fastqc.zip"
   - cutadapt
   - fastp
   - fastqc:
+      anchor: "fastqc_trimmed"
       name: "FastQC (trimmed)"
       info: "This section of the report shows FastQC results after adapter trimming."
       path_filters: