From 3f1119e4952ebe85b59a7829ef11427fab07b8e6 Mon Sep 17 00:00:00 2001
From: nf-core-bot
Date: Fri, 20 Dec 2024 16:50:35 +0100
Subject: [PATCH 1/7] Template update for nf-core/tools version 3.1.0
---
.editorconfig | 4 ++
.github/ISSUE_TEMPLATE/bug_report.yml | 1 -
.github/PULL_REQUEST_TEMPLATE.md | 4 +-
.github/workflows/download_pipeline.yml | 41 +++++++++++--------
.nf-core.yml | 10 ++---
.prettierignore | 1 +
CHANGELOG.md | 2 +-
CITATIONS.md | 4 +-
LICENSE | 2 +-
README.md | 15 ++-----
assets/multiqc_config.yml | 4 +-
assets/schema_input.json | 2 +-
conf/test.config | 4 +-
docs/output.md | 11 ++---
docs/usage.md | 2 +-
nextflow.config | 9 ++--
nextflow_schema.json | 2 +-
ro-crate-metadata.json | 41 ++++++++++++-------
.../local/utils_nfcore_mag_pipeline/main.nf | 2 +-
19 files changed, 87 insertions(+), 74 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index 72dda289..6d9b74cc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -31,3 +31,7 @@ indent_size = unset
# ignore python and markdown
[*.{py,md}]
indent_style = unset
+
+# ignore ro-crate metadata files
+[**/ro-crate-metadata.json]
+insert_final_newline = unset
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 146d5516..816733b0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -9,7 +9,6 @@ body:
- [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting)
- [nf-core/mag pipeline documentation](https://nf-co.re/mag/usage)
-
- type: textarea
id: description
attributes:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index e44a93d1..1ffcdcaf 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,14 +8,14 @@ These are the most common things requested on pull requests (PRs).
Remember that PRs should be made against the dev branch, unless you're preparing a pipeline release.
-Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/mag/tree/master/.github/CONTRIBUTING.md)
+Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/mag/tree/main/.github/CONTRIBUTING.md)
-->
## PR checklist
- [ ] This comment contains a description of changes (with reason).
- [ ] If you've fixed a bug or added code that should be tested, add tests!
-- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/mag/tree/master/.github/CONTRIBUTING.md)
+- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/mag/tree/main/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/mag _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] Make sure your code lints (`nf-core pipelines lint`).
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir `).
diff --git a/.github/workflows/download_pipeline.yml b/.github/workflows/download_pipeline.yml
index 2576cc0c..13b51e2c 100644
--- a/.github/workflows/download_pipeline.yml
+++ b/.github/workflows/download_pipeline.yml
@@ -28,8 +28,12 @@ env:
NXF_ANSI_LOG: false
jobs:
- download:
+ configure:
runs-on: ubuntu-latest
+ outputs:
+ REPO_LOWERCASE: ${{ steps.get_repo_properties.outputs.REPO_LOWERCASE }}
+ REPOTITLE_LOWERCASE: ${{ steps.get_repo_properties.outputs.REPOTITLE_LOWERCASE }}
+ REPO_BRANCH: ${{ steps.get_repo_properties.outputs.REPO_BRANCH }}
steps:
- name: Install Nextflow
uses: nf-core/setup-nextflow@v2
@@ -53,22 +57,27 @@ jobs:
pip install git+https://github.com/nf-core/tools.git@dev
- name: Get the repository name and current branch set as environment variable
+ id: get_repo_properties
run: |
- echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV}
- echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> ${GITHUB_ENV}
- echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> ${GITHUB_ENV}
+ echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> "$GITHUB_OUTPUT"
+ echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> "$GITHUB_OUTPUT"
+ echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> "$GITHUB_OUTPUT"
- name: Make a cache directory for the container images
run: |
mkdir -p ./singularity_container_images
+ download:
+ runs-on: ubuntu-latest
+ needs: configure
+ steps:
- name: Download the pipeline
env:
NXF_SINGULARITY_CACHEDIR: ./singularity_container_images
run: |
- nf-core pipelines download ${{ env.REPO_LOWERCASE }} \
- --revision ${{ env.REPO_BRANCH }} \
- --outdir ./${{ env.REPOTITLE_LOWERCASE }} \
+ nf-core pipelines download ${{ needs.configure.outputs.REPO_LOWERCASE }} \
+ --revision ${{ needs.configure.outputs.REPO_BRANCH }} \
+ --outdir ./${{ needs.configure.outputs.REPOTITLE_LOWERCASE }} \
--compress "none" \
--container-system 'singularity' \
--container-library "quay.io" -l "docker.io" -l "community.wave.seqera.io/library/" \
@@ -76,14 +85,14 @@ jobs:
--download-configuration 'yes'
- name: Inspect download
- run: tree ./${{ env.REPOTITLE_LOWERCASE }}
+ run: tree ./${{ needs.configure.outputs.REPOTITLE_LOWERCASE }}
- name: Count the downloaded number of container images
id: count_initial
run: |
image_count=$(ls -1 ./singularity_container_images | wc -l | xargs)
echo "Initial container image count: $image_count"
- echo "IMAGE_COUNT_INITIAL=$image_count" >> ${GITHUB_ENV}
+ echo "IMAGE_COUNT_INITIAL=$image_count" >> "$GITHUB_OUTPUT"
- name: Run the downloaded pipeline (stub)
id: stub_run_pipeline
@@ -91,27 +100,27 @@ jobs:
env:
NXF_SINGULARITY_CACHEDIR: ./singularity_container_images
NXF_SINGULARITY_HOME_MOUNT: true
- run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results
+ run: nextflow run ./${{needs.configure.outputs.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ needs.configure.outputs.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results
- name: Run the downloaded pipeline (stub run not supported)
id: run_pipeline
- if: ${{ job.steps.stub_run_pipeline.status == failure() }}
+ if: ${{ steps.stub_run_pipeline.outcome == 'failure' }}
env:
NXF_SINGULARITY_CACHEDIR: ./singularity_container_images
NXF_SINGULARITY_HOME_MOUNT: true
- run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -profile test,singularity --outdir ./results
+ run: nextflow run ./${{ needs.configure.outputs.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ needs.configure.outputs.REPO_BRANCH }}) -profile test,singularity --outdir ./results
- name: Count the downloaded number of container images
id: count_afterwards
run: |
image_count=$(ls -1 ./singularity_container_images | wc -l | xargs)
echo "Post-pipeline run container image count: $image_count"
- echo "IMAGE_COUNT_AFTER=$image_count" >> ${GITHUB_ENV}
+ echo "IMAGE_COUNT_AFTER=$image_count" >> "$GITHUB_OUTPUT"
- name: Compare container image counts
run: |
- if [ "${{ env.IMAGE_COUNT_INITIAL }}" -ne "${{ env.IMAGE_COUNT_AFTER }}" ]; then
- initial_count=${{ env.IMAGE_COUNT_INITIAL }}
- final_count=${{ env.IMAGE_COUNT_AFTER }}
+ if [ "${{ steps.count_initial.outputs.IMAGE_COUNT_INITIAL }}" -ne "${{ steps.count_afterwards.outputs.IMAGE_COUNT_AFTER }}" ]; then
+ initial_count=${{ steps.count_initial.outputs.IMAGE_COUNT_INITIAL }}
+ final_count=${{ steps.count_afterwards.outputs.IMAGE_COUNT_AFTER }}
difference=$((final_count - initial_count))
echo "$difference additional container images were \n downloaded at runtime . The pipeline has no support for offline runs!"
tree ./singularity_container_images
diff --git a/.nf-core.yml b/.nf-core.yml
index e724a711..d6b80c0d 100644
--- a/.nf-core.yml
+++ b/.nf-core.yml
@@ -1,10 +1,10 @@
lint:
files_unchanged:
- - lib/NfcoreTemplate.groovy
+ - lib/NfcoreTemplate.groovy
nextflow_config:
- - config_defaults:
- - params.phix_reference
- - params.lambda_reference
+ - config_defaults:
+ - params.phix_reference
+ - params.lambda_reference
nf_core_version: 3.1.0
repository_type: pipeline
template:
@@ -16,4 +16,4 @@ template:
name: mag
org: nf-core
outdir: .
- version: 3.3.0dev
+ version: 3.3.0
diff --git a/.prettierignore b/.prettierignore
index 437d763d..edd29f01 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -10,3 +10,4 @@ testing/
testing*
*.pyc
bin/
+ro-crate-metadata.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8383add..42737ad9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-## v3.3.0dev - [date]
+## v3.3.0 - [date]
Initial release of nf-core/mag, created with the [nf-core](https://nf-co.re/) template.
diff --git a/CITATIONS.md b/CITATIONS.md
index 0b6c25b1..06da5147 100644
--- a/CITATIONS.md
+++ b/CITATIONS.md
@@ -12,9 +12,7 @@
- [FastQC](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/)
-> Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online].
-
-- [MultiQC](https://pubmed.ncbi.nlm.nih.gov/27312411/)
+> Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online].- [MultiQC](https://pubmed.ncbi.nlm.nih.gov/27312411/)
> Ewels P, Magnusson M, Lundin S, Käller M. MultiQC: summarize analysis results for multiple tools and samples in a single report. Bioinformatics. 2016 Oct 1;32(19):3047-8. doi: 10.1093/bioinformatics/btw354. Epub 2016 Jun 16. PubMed PMID: 27312411; PubMed Central PMCID: PMC5039924.
diff --git a/LICENSE b/LICENSE
index d90d555c..4502ee82 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) Hadrien Gourlé, Daniel Straub, Sabrina Krakau, James A. Fellows Yates, Maxime Borry
+Copyright (c) The nf-core/mag team
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index b1f300d1..8f0506ce 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,7 @@
-
## Pipeline summary
By default, the pipeline currently performs the following: it supports both short and long reads, quality trims the reads and adapters with [fastp](https://github.com/OpenGene/fastp) and [Porechop](https://github.com/rrwick/Porechop), and performs basic QC with [FastQC](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/), and merge multiple sequencing runs.
From f097aa7ba7fdc6b3384c3662a95f3b3a03e9e23e Mon Sep 17 00:00:00 2001
From: "James A. Fellows Yates"
Date: Thu, 9 Jan 2025 17:15:00 +0100
Subject: [PATCH 5/7] Fix linting
---
assets/multiqc_config.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assets/multiqc_config.yml b/assets/multiqc_config.yml
index fe5c5b73..5b76f018 100644
--- a/assets/multiqc_config.yml
+++ b/assets/multiqc_config.yml
@@ -1,5 +1,5 @@
report_comment: >
- This report has been generated by the nf-core/mag
+ This report has been generated by the nf-core/mag
analysis pipeline. For information about how to interpret these results, please see the
documentation.
report_section_order:
From 5ac1004a54816b628676b49b424d45e716d83854 Mon Sep 17 00:00:00 2001
From: "James A. Fellows Yates"
Date: Sun, 19 Jan 2025 06:26:06 +0000
Subject: [PATCH 6/7] Fix PR template
---
.github/PULL_REQUEST_TEMPLATE.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 1ffcdcaf..e44a93d1 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,14 +8,14 @@ These are the most common things requested on pull requests (PRs).
Remember that PRs should be made against the dev branch, unless you're preparing a pipeline release.
-Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/mag/tree/main/.github/CONTRIBUTING.md)
+Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/mag/tree/master/.github/CONTRIBUTING.md)
-->
## PR checklist
- [ ] This comment contains a description of changes (with reason).
- [ ] If you've fixed a bug or added code that should be tested, add tests!
-- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/mag/tree/main/.github/CONTRIBUTING.md)
+- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/mag/tree/master/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/mag _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] Make sure your code lints (`nf-core pipelines lint`).
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir `).
From 7ac02b0b075e22be2eea07e571c0059a86699f0b Mon Sep 17 00:00:00 2001
From: "James A. Fellows Yates"
Date: Sun, 19 Jan 2025 07:30:30 +0100
Subject: [PATCH 7/7] Apply suggestions from code review
---
README.md | 1 +
assets/schema_input.json | 2 +-
nextflow.config | 4 ++--
nextflow_schema.json | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index c5638380..c0f4000d 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@
[![GitHub Actions CI Status](https://github.com/nf-core/mag/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/mag/actions/workflows/ci.yml)
[![GitHub Actions Linting Status](https://github.com/nf-core/mag/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/mag/actions/workflows/linting.yml)[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/mag/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.3589527-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.3589527)
[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)
+[![Cite Publication](https://img.shields.io/badge/Cite%20Us!-Cite%20Publication-orange)](https://doi.org/10.1093/nargab/lqac007)
[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A524.04.2-23aa62.svg)](https://www.nextflow.io/)
[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)
diff --git a/assets/schema_input.json b/assets/schema_input.json
index 15e76aa7..01b494b5 100644
--- a/assets/schema_input.json
+++ b/assets/schema_input.json
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
- "$id": "https://raw.githubusercontent.com/nf-core/mag/main/assets/schema_input.json",
+ "$id": "https://raw.githubusercontent.com/nf-core/mag/master/assets/schema_input.json",
"title": "nf-core/mag pipeline - params.input schema",
"description": "Schema for the file provided with params.input",
"type": "array",
diff --git a/nextflow.config b/nextflow.config
index e54911c3..387fee34 100644
--- a/nextflow.config
+++ b/nextflow.config
@@ -453,7 +453,7 @@ manifest {
homePage = 'https://github.com/nf-core/mag'
description = """Assembly, binning and annotation of metagenomes"""
mainScript = 'main.nf'
- defaultBranch = 'main'
+ defaultBranch = 'master'
nextflowVersion = '!>=24.04.2'
version = '3.3.1dev'
doi = '10.1093/nargab/lqac007'
@@ -487,7 +487,7 @@ validation {
https://doi.org/10.1038/s41587-020-0439-x
* Software dependencies
- https://github.com/nf-core/mag/blob/main/CITATIONS.md
+ https://github.com/nf-core/mag/blob/master/CITATIONS.md
"""
}
summary {
diff --git a/nextflow_schema.json b/nextflow_schema.json
index 09d068bc..18307b05 100644
--- a/nextflow_schema.json
+++ b/nextflow_schema.json
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
- "$id": "https://raw.githubusercontent.com/nf-core/mag/main/nextflow_schema.json",
+ "$id": "https://raw.githubusercontent.com/nf-core/mag/master/nextflow_schema.json",
"title": "nf-core/mag pipeline parameters",
"description": "Assembly, binning and annotation of metagenomes",
"type": "object",