Skip to content

Commit 9c13ff5

Browse files
authored
Merge pull request #51 from nf-core/nf-core-template-merge-3.3.1
Important! Template update for nf-core/tools v3.3.1
2 parents 7ade8b3 + 78bdb3e commit 9c13ff5

26 files changed

Lines changed: 147 additions & 153 deletions

.editorconfig

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ If you wish to contribute a new step, please use the following coding standards:
7878
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core pipelines schema build` tool).
7979
6. Add sanity checks and validation for all relevant parameters.
8080
7. Perform local tests to validate that the new code works as expected.
81-
8. If applicable, add a new test command in `.github/workflow/ci.yml`.
81+
8. If applicable, add a new test in the `tests` directory.
8282
9. Update MultiQC config `assets/multiqc_config.yml` so relevant suffixes, file name clean up and module plots are in the appropriate order. If applicable, add a [MultiQC](https://https://multiqc.info/) module.
8383
10. Add a description of the output files and if relevant any appropriate images from the MultiQC report to `docs/output.md`.
8484

.github/actions/get-shards/action.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ inputs:
77
paths:
88
description: "Component paths to test"
99
required: false
10+
tags:
11+
description: "Tags to pass as argument for nf-test --tag parameter"
12+
required: false
1013
outputs:
1114
shard:
1215
description: "Array of shard numbers"
@@ -27,9 +30,9 @@ runs:
2730
run: |
2831
# Run nf-test with dynamic parameter
2932
nftest_output=$(nf-test test \
30-
--dry-run \
3133
--profile +docker \
32-
--filter function,workflow,pipeline \
34+
$(if [ -n "${{ inputs.tags }}" ]; then echo "--tag ${{ inputs.tags }}"; fi) \
35+
--dry-run \
3336
--ci \
3437
--changed-since HEAD^) || {
3538
echo "nf-test command failed with exit code $?"

.github/actions/nf-test/action.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ inputs:
1313
paths:
1414
description: "Test paths"
1515
required: true
16-
16+
tags:
17+
description: "Tags to pass as argument for nf-test --tag parameter"
18+
required: false
1719
runs:
1820
using: "composite"
1921
steps:
@@ -23,14 +25,15 @@ runs:
2325
version: "${{ env.NXF_VERSION }}"
2426

2527
- name: Set up Python
26-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
28+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
2729
with:
28-
python-version: "3.11"
30+
python-version: "3.13"
2931

3032
- name: Install nf-test
3133
uses: nf-core/setup-nf-test@v1
3234
with:
3335
version: "${{ env.NFT_VER }}"
36+
install-pdiff: true
3437

3538
- name: Setup apptainer
3639
if: contains(inputs.profile, 'singularity')
@@ -44,21 +47,12 @@ runs:
4447
mkdir -p $NXF_SINGULARITY_LIBRARYDIR
4548
4649
- name: Conda setup
47-
if: ${{inputs.profile == 'conda'}}
50+
if: contains(inputs.profile, 'conda')
4851
uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3
4952
with:
5053
auto-update-conda: true
5154
conda-solver: libmamba
5255
conda-remove-defaults: true
53-
54-
- name: Install pdiff
55-
shell: bash
56-
run: |
57-
python -m pip install pdiff
58-
59-
- name: Clean up Disk space
60-
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
61-
6256
# TODO Skip failing conda tests and document their failures
6357
# https://github.com/nf-core/modules/issues/7017
6458
- name: Run nf-test
@@ -70,12 +64,12 @@ runs:
7064
run: |
7165
nf-test test \
7266
--profile=+${{ inputs.profile }} \
73-
--tap=test.tap \
74-
--verbose \
67+
$(if [ -n "${{ inputs.tags }}" ]; then echo "--tag ${{ inputs.tags }}"; fi) \
7568
--ci \
7669
--changed-since HEAD^ \
77-
--shard ${{ inputs.shard }}/${{ inputs.total_shards }} \
78-
--filter function,workflow,pipeline
70+
--verbose \
71+
--tap=test.tap \
72+
--shard ${{ inputs.shard }}/${{ inputs.total_shards }}
7973
8074
# Save the absolute path of the test.tap file to the output
8175
echo "tap_file_path=$(realpath test.tap)" >> $GITHUB_OUTPUT

.github/workflows/awsfulltest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
run-platform:
1515
name: Run AWS full tests
1616
# run only if the PR is approved by at least 2 reviewers and against the master/main branch or manually triggered
17-
if: github.repository == 'nf-core/proteinannotator' && github.event.review.state == 'approved' && (github.event.pull_request.base.ref == 'master' || github.event.pull_request.base.ref == 'main') || github.event_name == 'workflow_dispatch'
17+
if: github.repository == 'nf-core/proteinannotator' && github.event.review.state == 'approved' && (github.event.pull_request.base.ref == 'master' || github.event.pull_request.base.ref == 'main') || github.event_name == 'workflow_dispatch' || github.event_name == 'release'
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Set revision variable
@@ -40,7 +40,7 @@ jobs:
4040
}
4141
profiles: test_full
4242

43-
- uses: actions/upload-artifact@v4
43+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
4444
with:
4545
name: Seqera Platform debug log file
4646
path: |

.github/workflows/awstest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
}
2626
profiles: test
2727

28-
- uses: actions/upload-artifact@v4
28+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
2929
with:
3030
name: Seqera Platform debug log file
3131
path: |

.github/workflows/clean-up.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
issues: write
1111
pull-requests: write
1212
steps:
13-
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
13+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
1414
with:
1515
stale-issue-message: "This issue has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor. Remove stale label or add a comment otherwise this issue will be closed in 20 days."
1616
stale-pr-message: "This PR has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor. Remove stale label or add a comment if it is still useful."

.github/workflows/download_pipeline.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ on:
1212
required: true
1313
default: "dev"
1414
pull_request:
15-
types:
16-
- opened
17-
- edited
18-
- synchronize
19-
branches:
20-
- main
21-
- master
22-
pull_request_target:
2315
branches:
2416
- main
2517
- master
@@ -52,9 +44,9 @@ jobs:
5244
- name: Disk space cleanup
5345
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
5446

55-
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
47+
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
5648
with:
57-
python-version: "3.12"
49+
python-version: "3.13"
5850
architecture: "x64"
5951

6052
- name: Setup Apptainer
@@ -120,6 +112,7 @@ jobs:
120112
echo "IMAGE_COUNT_AFTER=$image_count" >> "$GITHUB_OUTPUT"
121113
122114
- name: Compare container image counts
115+
id: count_comparison
123116
run: |
124117
if [ "${{ steps.count_initial.outputs.IMAGE_COUNT_INITIAL }}" -ne "${{ steps.count_afterwards.outputs.IMAGE_COUNT_AFTER }}" ]; then
125118
initial_count=${{ steps.count_initial.outputs.IMAGE_COUNT_INITIAL }}
@@ -132,3 +125,10 @@ jobs:
132125
else
133126
echo "The pipeline can be downloaded successfully!"
134127
fi
128+
129+
- name: Upload Nextflow logfile for debugging purposes
130+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
131+
with:
132+
name: nextflow_logfile.txt
133+
path: .nextflow.log*
134+
include-hidden-files: true
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}
3333

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

3939
- name: Install pre-commit
4040
run: pip install pre-commit

.github/workflows/linting.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: nf-core linting
33
# It runs the `nf-core pipelines lint` and markdown lint tests to ensure
44
# that the code meets the nf-core guidelines.
55
on:
6-
push:
7-
branches:
8-
- dev
96
pull_request:
107
release:
118
types: [published]
@@ -17,9 +14,9 @@ jobs:
1714
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1815

1916
- name: Set up Python 3.12
20-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
17+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
2118
with:
22-
python-version: "3.12"
19+
python-version: "3.13"
2320

2421
- name: Install pre-commit
2522
run: pip install pre-commit
@@ -36,13 +33,13 @@ jobs:
3633
- name: Install Nextflow
3734
uses: nf-core/setup-nextflow@v2
3835

39-
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
36+
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
4037
with:
41-
python-version: "3.12"
38+
python-version: "3.13"
4239
architecture: "x64"
4340

4441
- name: read .nf-core.yml
45-
uses: pietrobolcato/action-read-yaml@1.1.0
42+
uses: pietrobolcato/action-read-yaml@9f13718d61111b69f30ab4ac683e67a56d254e1d # 1.1.0
4643
id: read_yml
4744
with:
4845
config: ${{ github.workspace }}/.nf-core.yml
@@ -74,7 +71,7 @@ jobs:
7471

7572
- name: Upload linting log file artifact
7673
if: ${{ always() }}
77-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
74+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
7875
with:
7976
name: linting-logs
8077
path: |

0 commit comments

Comments
 (0)