Skip to content

Commit 049ea0a

Browse files
authored
Merge pull request #734 from nf-core/dev
nf-core 3.3.0 release
2 parents b582aae + bde62aa commit 049ea0a

File tree

111 files changed

+8712
-1726
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+8712
-1726
lines changed

.github/CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# nf-core/mag: Contributing Guidelines
1+
# `nf-core/mag`: Contributing Guidelines
22

33
Hi there!
44
Many thanks for taking an interest in improving nf-core/mag.
@@ -55,23 +55,23 @@ These tests are run both with the latest available version of `Nextflow` and als
5555

5656
:warning: Only in the unlikely and regretful event of a release happening with a bug.
5757

58-
- On your own fork, make a new branch `patch` based on `upstream/master`.
58+
- On your own fork, make a new branch `patch` based on `upstream/main` or `upstream/master`.
5959
- Fix the bug, and bump version (X.Y.Z+1).
60-
- A PR should be made on `master` from patch to directly this particular bug.
60+
- Open a pull-request from `patch` to `main`/`master` with the changes.
6161

6262
## Getting help
6363

6464
For further information/help, please consult the [nf-core/mag documentation](https://nf-co.re/mag/usage) and don't hesitate to get in touch on the nf-core Slack [#mag](https://nfcore.slack.com/channels/mag) channel ([join our Slack here](https://nf-co.re/join/slack)).
6565

6666
## Pipeline contribution conventions
6767

68-
To make the nf-core/mag code and processing logic more understandable for new contributors and to ensure quality, we semi-standardise the way the code and other contributions are written.
68+
To make the `nf-core/mag` code and processing logic more understandable for new contributors and to ensure quality, we semi-standardise the way the code and other contributions are written.
6969

7070
### Adding a new step
7171

7272
If you wish to contribute a new step, please use the following coding standards:
7373

74-
1. Define the corresponding input channel into your new process from the expected previous process channel
74+
1. Define the corresponding input channel into your new process from the expected previous process channel.
7575
2. Write the process block (see below).
7676
3. Define the output channel if needed (see below).
7777
4. Add any new parameters to `nextflow.config` with a default (see below).
@@ -84,7 +84,7 @@ If you wish to contribute a new step, please use the following coding standards:
8484

8585
### Default values
8686

87-
Parameters should be initialised / defined with default values in `nextflow.config` under the `params` scope.
87+
Parameters should be initialised / defined with default values within the `params` scope in `nextflow.config`.
8888

8989
Once there, use `nf-core pipelines schema build` to add to `nextflow_schema.json`.
9090

.github/workflows/awsfulltest.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
name: nf-core AWS full size tests
2-
# This workflow is triggered on PRs opened against the master branch.
2+
# This workflow is triggered on PRs opened against the main/master branch.
33
# It can be additionally triggered manually with GitHub actions workflow dispatch button.
44
# It runs the -profile 'test_full' on AWS batch
55

66
on:
77
pull_request:
88
branches:
9+
- main
910
- master
1011
workflow_dispatch:
1112
pull_request_review:
@@ -18,19 +19,30 @@ jobs:
1819
if: github.repository == 'nf-core/mag' && github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'master' || github.event_name == 'workflow_dispatch'
1920
runs-on: ubuntu-latest
2021
steps:
21-
- uses: octokit/[email protected]
22+
- name: Get PR reviews
23+
uses: octokit/[email protected]
2224
if: github.event_name != 'workflow_dispatch'
2325
id: check_approvals
26+
continue-on-error: true
2427
with:
2528
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews?per_page=100
2629
env:
2730
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28-
- id: test_variables
31+
32+
- name: Check for approvals
33+
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
34+
run: |
35+
echo "No review approvals found. At least 2 approvals are required to run this action automatically."
36+
exit 1
37+
38+
- name: Check for enough approvals (>=2)
39+
id: test_variables
2940
if: github.event_name != 'workflow_dispatch'
3041
run: |
3142
JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}'
3243
CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length')
3344
test $CURRENT_APPROVALS_COUNT -ge 2 || exit 1 # At least 2 approvals are required
45+
3446
- name: Launch workflow via Seqera Platform
3547
uses: seqeralabs/action-tower-launch@v2
3648
with:

.github/workflows/branch.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
name: nf-core branch protection
2-
# This workflow is triggered on PRs to master branch on the repository
3-
# It fails when someone tries to make a PR against the nf-core `master` branch instead of `dev`
2+
# This workflow is triggered on PRs to `main`/`master` branch on the repository
3+
# It fails when someone tries to make a PR against the nf-core `main`/`master` branch instead of `dev`
44
on:
55
pull_request_target:
6-
branches: [master]
6+
branches:
7+
- main
8+
- master
79

810
jobs:
911
test:
1012
runs-on: ubuntu-latest
1113
steps:
12-
# PRs to the nf-core repo master branch are only ok if coming from the nf-core repo `dev` or any `patch` branches
14+
# PRs to the nf-core repo main/master branch are only ok if coming from the nf-core repo `dev` or any `patch` branches
1315
- name: Check PRs
1416
if: github.repository == 'nf-core/mag'
1517
run: |
@@ -22,7 +24,7 @@ jobs:
2224
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2
2325
with:
2426
message: |
25-
## This PR is against the `master` branch :x:
27+
## This PR is against the `${{github.event.pull_request.base.ref}}` branch :x:
2628
2729
* Do not close this PR
2830
* Click _Edit_ and change the `base` to `dev`
@@ -32,9 +34,9 @@ jobs:
3234
3335
Hi @${{ github.event.pull_request.user.login }},
3436
35-
It looks like this pull-request is has been made against the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `master` branch.
36-
The `master` branch on nf-core repositories should always contain code from the latest release.
37-
Because of this, PRs to `master` are only allowed if they come from the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `dev` branch.
37+
It looks like this pull-request is has been made against the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) ${{github.event.pull_request.base.ref}} branch.
38+
The ${{github.event.pull_request.base.ref}} branch on nf-core repositories should always contain code from the latest release.
39+
Because of this, PRs to ${{github.event.pull_request.base.ref}} are only allowed if they come from the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `dev` branch.
3840
3941
You do not need to close this PR, you can change the target branch to `dev` by clicking the _"Edit"_ button at the top of this page.
4042
Note that even after this, the test will continue to show as failing until you push a new commit.

.github/workflows/ci.yml

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
5151
5252
- name: Check out pipeline code
53-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
53+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
5454

5555
- name: Set up Nextflow
5656
uses: nf-core/setup-nextflow@v2
@@ -130,36 +130,3 @@ jobs:
130130
- name: Run pipeline with ${{ matrix.test_name }} test profile
131131
run: |
132132
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.test_name }},docker --outdir ./results
133-
134-
checkm:
135-
name: Run single test to checkm due to database download
136-
# Only run on push if this is the nf-core dev branch (merged PRs)
137-
if: ${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/mag') }}
138-
runs-on: ubuntu-latest
139-
140-
steps:
141-
- name: Free some space
142-
run: |
143-
sudo rm -rf "/usr/local/share/boost"
144-
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
145-
146-
- name: Check out pipeline code
147-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
148-
149-
- name: Install Nextflow
150-
run: |
151-
wget -qO- get.nextflow.io | bash
152-
sudo mv nextflow /usr/local/bin/
153-
154-
- name: Clean up Disk space
155-
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
156-
157-
- name: Download and prepare CheckM database
158-
run: |
159-
mkdir -p databases/checkm
160-
wget https://zenodo.org/records/7401545/files/checkm_data_2015_01_16.tar.gz -P databases/checkm
161-
tar xzvf databases/checkm/checkm_data_2015_01_16.tar.gz -C databases/checkm/
162-
163-
- name: Run pipeline with ${{ matrix.profile }} test profile
164-
run: |
165-
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results --binqc_tool checkm --checkm_db databases/checkm

.github/workflows/download_pipeline.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Test successful pipeline download with 'nf-core pipelines download'
22

33
# Run the workflow when:
44
# - dispatched manually
5-
# - when a PR is opened or reopened to master branch
5+
# - when a PR is opened or reopened to main/master branch
66
# - the head branch of the pull request is updated, i.e. if fixes for a release are pushed last minute to dev.
77
on:
88
workflow_dispatch:
@@ -17,9 +17,11 @@ on:
1717
- edited
1818
- synchronize
1919
branches:
20+
- main
2021
- master
2122
pull_request_target:
2223
branches:
24+
- main
2325
- master
2426

2527
env:
@@ -35,7 +37,7 @@ jobs:
3537
- name: Disk space cleanup
3638
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
3739

38-
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
40+
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
3941
with:
4042
python-version: "3.12"
4143
architecture: "x64"
@@ -69,7 +71,7 @@ jobs:
6971
--outdir ./${{ env.REPOTITLE_LOWERCASE }} \
7072
--compress "none" \
7173
--container-system 'singularity' \
72-
--container-library "quay.io" -l "docker.io" -l "community.wave.seqera.io" \
74+
--container-library "quay.io" -l "docker.io" -l "community.wave.seqera.io/library/" \
7375
--container-cache-utilisation 'amend' \
7476
--download-configuration 'yes'
7577

.github/workflows/fix-linting.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
# Use the @nf-core-bot token to check out so we can push later
16-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
16+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1717
with:
1818
token: ${{ secrets.nf_core_bot_auth_token }}
1919

@@ -32,7 +32,7 @@ jobs:
3232
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}
3333

3434
# Install and run pre-commit
35-
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
35+
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
3636
with:
3737
python-version: "3.12"
3838

.github/workflows/linting.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
pre-commit:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
17+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1818

1919
- name: Set up Python 3.12
20-
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
20+
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
2121
with:
2222
python-version: "3.12"
2323

@@ -31,12 +31,12 @@ jobs:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- name: Check out pipeline code
34-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
34+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3535

3636
- name: Install Nextflow
3737
uses: nf-core/setup-nextflow@v2
3838

39-
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
39+
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
4040
with:
4141
python-version: "3.12"
4242
architecture: "x64"
@@ -74,7 +74,7 @@ jobs:
7474

7575
- name: Upload linting log file artifact
7676
if: ${{ always() }}
77-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
77+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
7878
with:
7979
name: linting-logs
8080
path: |

.github/workflows/linting_comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Download lint results
14-
uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11 # v6
14+
uses: dawidd6/action-download-artifact@80620a5d27ce0ae443b965134db88467fc607b43 # v7
1515
with:
1616
workflow: linting.yml
1717
workflow_conclusion: completed

.github/workflows/release-announcements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: ubuntu-latest
3232

3333
steps:
34-
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
34+
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
3535
with:
3636
python-version: "3.10"
3737
- name: Install dependencies

.github/workflows/template_version_comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Check out pipeline code
12-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
12+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1313
with:
1414
ref: ${{ github.event.pull_request.head.sha }}
1515

.gitpod.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,5 @@ tasks:
66
nextflow self-update
77
88
vscode:
9-
extensions: # based on nf-core.nf-core-extensionpack
10-
#- esbenp.prettier-vscode # Markdown/CommonMark linting and style checking for Visual Studio Code
11-
- EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files
12-
- Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar
13-
- mechatroner.rainbow-csv # Highlight columns in csv files in different colors
14-
- nextflow.nextflow # Nextflow syntax highlighting
15-
- oderwat.indent-rainbow # Highlight indentation level
16-
- streetsidesoftware.code-spell-checker # Spelling checker for source code
17-
- charliermarsh.ruff # Code linter Ruff
9+
extensions:
10+
- nf-core.nf-core-extensionpack # https://github.com/nf-core/vscode-extensionpack

.nf-core.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
1-
bump_version: null
21
lint:
32
files_unchanged:
43
- lib/NfcoreTemplate.groovy
54
nextflow_config:
65
- config_defaults:
76
- params.phix_reference
87
- params.lambda_reference
9-
nf_core_version: 3.0.2
10-
org_path: null
8+
nf_core_version: 3.1.0
119
repository_type: pipeline
1210
template:
13-
author: "Hadrien Gourlé, Daniel Straub, Sabrina Krakau, James A. Fellows Yates, Maxime Borry"
11+
author: "Hadrien Gourlé, Daniel Straub, Sabrina Krakau, James A. Fellows Yates,
12+
Maxime Borry"
1413
description: Assembly, binning and annotation of metagenomes
1514
force: false
1615
is_nfcore: true
1716
name: mag
1817
org: nf-core
1918
outdir: .
20-
skip_features: null
21-
version: 3.2.1
22-
update: null
19+
version: 3.3.0

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"markdown.styles": ["public/vscode_markdown.css"]
3+
}

CHANGELOG.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,41 @@
33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
44
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
55

6+
## 3.3.0 [2024-12-19]
7+
8+
### `Added`
9+
10+
- [#692](https://github.com/nf-core/mag/pull/692) - Added Nanoq as optional longread filtering tool (added by @muabnezor)
11+
- [#692](https://github.com/nf-core/mag/pull/692) - Added chopper as optional longread filtering tool and/or phage lambda removal tool (added by @muabnezor)
12+
- [#707](https://github.com/nf-core/mag/pull/707) - Make Bin QC a subworkflow (added by @dialvarezs)
13+
- [#707](https://github.com/nf-core/mag/pull/707) - Added CheckM2 as an alternative bin completeness and QC tool (added by @dialvarezs)
14+
- [#708](https://github.com/nf-core/mag/pull/708) - Added `--exclude_unbins_from_postbinning` parameter to exclude unbinned contigs from post-binning processes, speeding up Prokka in some cases (added by @dialvarezs)
15+
- [#732](https://github.com/nf-core/mag/pull/732) - Added support for Prokka's compliance mode with `--prokka_with_compliance --prokka_compliance_centre <xyz>` (reported by @audy and @Thomieh73, added by @jfy133)
16+
17+
### `Changed`
18+
19+
- [#731](https://github.com/nf-core/mag/pull/731) - Updated to nf-core 3.1.0 `TEMPLATE` (by @jfy133)
20+
21+
### `Fixed`
22+
23+
- [#707](https://github.com/nf-core/mag/pull/708) - Fixed channel passed as GUNC input (added by @dialvarezs)
24+
- [#724](https://github.com/nf-core/mag/pull/724) - Fix quoting in `utils_nfcore_mag_pipeline/main.nf` (added by @dialvarezs)
25+
- [#716](https://github.com/nf-core/mag/pull/692) - Make short read processing a subworkflow (added by @muabnezor)
26+
- [#708](https://github.com/nf-core/mag/pull/708) - Fixed channel passed as GUNC input (added by @dialvarezs)
27+
- [#729](https://github.com/nf-core/mag/pull/729) - Fixed misspecified multi-FASTQ input for single-end data in MEGAHIT (reported by John Richards, fix by @jfy133)
28+
29+
### `Dependencies`
30+
31+
| Tool | Previous version | New version |
32+
| ------- | ---------------- | ----------- |
33+
| CheckM | 1.2.1 | 1.2.3 |
34+
| CheckM2 | | 1.0.2 |
35+
| chopper | | 0.9.0 |
36+
| GUNC | 1.0.5 | 1.0.6 |
37+
| nanoq | | 0.10.0 |
38+
39+
### `Deprecated`
40+
641
## 3.2.1 [2024-10-30]
742

843
### `Added`

0 commit comments

Comments
 (0)