Skip to content

Commit efda61b

Browse files
authored
Template update for nf-core/tools version 3.5.1 (#38)
* Template update for nf-core/tools version 3.1.1 * Template update for nf-core/tools version 3.2.0 * Template update for nf-core/tools version 3.2.1 * Template update for nf-core/tools version 3.5.1 * multiqc * Update changelog * Fix linting * Update snaps * Add topics * Fix multiqc * Bring back env yaml * Add authors * fix linting * conf * conf
1 parent 877acf8 commit efda61b

50 files changed

Lines changed: 540 additions & 367 deletions

Some content is hidden

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

.devcontainer/devcontainer.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
22
"name": "nfcore",
3-
"image": "nfcore/gitpod:latest",
4-
"remoteUser": "gitpod",
5-
"runArgs": ["--privileged"],
3+
"image": "nfcore/devcontainer:latest",
64

7-
// Configure tool-specific properties.
8-
"customizations": {
9-
// Configure properties specific to VS Code.
10-
"vscode": {
11-
// Set *default* container specific settings.json values on container create.
12-
"settings": {
13-
"python.defaultInterpreterPath": "/opt/conda/bin/python"
14-
},
5+
"remoteUser": "root",
6+
"privileged": true,
157

16-
// Add the IDs of extensions you want installed when the container is created.
17-
"extensions": ["ms-python.python", "ms-python.vscode-pylance", "nf-core.nf-core-extensionpack"]
18-
}
8+
"remoteEnv": {
9+
// Workspace path on the host for mounting with docker-outside-of-docker
10+
"LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}"
11+
},
12+
13+
"onCreateCommand": "./.devcontainer/setup.sh",
14+
15+
"hostRequirements": {
16+
"cpus": 4,
17+
"memory": "16gb",
18+
"storage": "32gb"
1919
}
2020
}

.devcontainer/setup.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
3+
# Customise the terminal command prompt
4+
echo "export PROMPT_DIRTRIM=2" >> $HOME/.bashrc
5+
echo "export PS1='\[\e[3;36m\]\w ->\[\e[0m\\] '" >> $HOME/.bashrc
6+
export PROMPT_DIRTRIM=2
7+
export PS1='\[\e[3;36m\]\w ->\[\e[0m\\] '
8+
9+
# Update Nextflow
10+
nextflow self-update
11+
12+
# Update welcome message
13+
echo "Welcome to the qbic-pipelines/vcftomaf devcontainer!" > /usr/local/etc/vscode-dev-containers/first-run-notice.txt

.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
@@ -71,7 +71,7 @@ If you wish to contribute a new step, please use the following coding standards:
7171
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core pipelines schema build` tool).
7272
6. Add sanity checks and validation for all relevant parameters.
7373
7. Perform local tests to validate that the new code works as expected.
74-
8. If applicable, add a new test command in `.github/workflow/ci.yml`.
74+
8. If applicable, add a new test in the `tests` directory.
7575
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.
7676
10. Add a description of the output files and if relevant any appropriate images from the MultiQC report to `docs/output.md`.
7777

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ inputs:
99
required: false
1010
tags:
1111
description: "Tags to pass as argument for nf-test --tag parameter"
12-
required: true
12+
required: false
1313
outputs:
1414
shard:
1515
description: "Array of shard numbers"
@@ -31,7 +31,7 @@ runs:
3131
# Run nf-test with dynamic parameter
3232
nftest_output=$(nf-test test \
3333
--profile +docker \
34-
--tag ${{ inputs.tags }} \
34+
$(if [ -n "${{ inputs.tags }}" ]; then echo "--tag ${{ inputs.tags }}"; fi) \
3535
--dry-run \
3636
--ci \
3737
--changed-since HEAD^) || {

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

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ inputs:
1515
required: true
1616
tags:
1717
description: "Tags to pass as argument for nf-test --tag parameter"
18-
required: true
18+
required: false
1919
runs:
2020
using: "composite"
2121
steps:
@@ -25,14 +25,15 @@ runs:
2525
version: "${{ env.NXF_VERSION }}"
2626

2727
- name: Set up Python
28-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
28+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
2929
with:
30-
python-version: "3.11"
30+
python-version: "3.14"
3131

3232
- name: Install nf-test
3333
uses: nf-core/setup-nf-test@v1
3434
with:
3535
version: "${{ env.NFT_VER }}"
36+
install-pdiff: true
3637

3738
- name: Setup apptainer
3839
if: contains(inputs.profile, 'singularity')
@@ -46,38 +47,28 @@ runs:
4647
mkdir -p $NXF_SINGULARITY_LIBRARYDIR
4748
4849
- name: Conda setup
49-
if: ${{inputs.profile == 'conda'}}
50+
if: contains(inputs.profile, 'conda')
5051
uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3
5152
with:
5253
auto-update-conda: true
5354
conda-solver: libmamba
55+
channels: conda-forge
56+
channel-priority: strict
5457
conda-remove-defaults: true
5558

56-
- name: Install pdiff
57-
shell: bash
58-
run: |
59-
python -m pip install pdiff
60-
61-
- name: Clean up Disk space
62-
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
63-
64-
# TODO Skip failing conda tests and document their failures
65-
# https://github.com/nf-core/modules/issues/7017
6659
- name: Run nf-test
6760
shell: bash
6861
env:
69-
NFT_DIFF: ${{ env.NFT_DIFF }}
70-
NFT_DIFF_ARGS: ${{ env.NFT_DIFF_ARGS }}
7162
NFT_WORKDIR: ${{ env.NFT_WORKDIR }}
7263
run: |
7364
nf-test test \
7465
--profile=+${{ inputs.profile }} \
75-
--tag ${{ inputs.tags }} \
76-
--tap=test.tap \
77-
--verbose \
66+
$(if [ -n "${{ inputs.tags }}" ]; then echo "--tag ${{ inputs.tags }}"; fi) \
7867
--ci \
7968
--changed-since HEAD^ \
80-
--shard ${{ inputs.shard }}/${{ inputs.total_shards }} \
69+
--verbose \
70+
--tap=test.tap \
71+
--shard ${{ inputs.shard }}/${{ inputs.total_shards }}
8172
8273
# Save the absolute path of the test.tap file to the output
8374
echo "tap_file_path=$(realpath test.tap)" >> $GITHUB_OUTPUT

.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@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10
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: 12 additions & 12 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@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
5648
with:
57-
python-version: "3.12"
49+
python-version: "3.14"
5850
architecture: "x64"
5951

6052
- name: Setup Apptainer
@@ -65,7 +57,7 @@ jobs:
6557
- name: Install dependencies
6658
run: |
6759
python -m pip install --upgrade pip
68-
pip install git+https://github.com/nf-core/tools.git@dev
60+
pip install git+https://github.com/nf-core/tools.git
6961
7062
- name: Make a cache directory for the container images
7163
run: |
@@ -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 }}
@@ -131,4 +124,11 @@ jobs:
131124
exit 1
132125
else
133126
echo "The pipeline can be downloaded successfully!"
134-
fi{% endraw %}{% endif %}
127+
fi
128+
129+
- name: Upload Nextflow logfile for debugging purposes
130+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
131+
with:
132+
name: nextflow_logfile.txt
133+
path: .nextflow.log*
134+
include-hidden-files: true
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ 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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
16+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
1717
with:
1818
token: ${{ secrets.nf_core_bot_auth_token }}
1919

2020
# indication that the linting is being fixed
2121
- name: React on comment
22-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
22+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
2323
with:
2424
comment-id: ${{ github.event.comment.id }}
2525
reactions: eyes
@@ -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@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
3636
with:
37-
python-version: "3.12"
37+
python-version: "3.14"
3838

3939
- name: Install pre-commit
4040
run: pip install pre-commit
@@ -47,7 +47,7 @@ jobs:
4747
# indication that the linting has finished
4848
- name: react if linting finished succesfully
4949
if: steps.pre-commit.outcome == 'success'
50-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
50+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
5151
with:
5252
comment-id: ${{ github.event.comment.id }}
5353
reactions: "+1"
@@ -67,21 +67,21 @@ jobs:
6767
- name: react if linting errors were fixed
6868
id: react-if-fixed
6969
if: steps.commit-and-push.outcome == 'success'
70-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
70+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
7171
with:
7272
comment-id: ${{ github.event.comment.id }}
7373
reactions: hooray
7474

7575
- name: react if linting errors were not fixed
7676
if: steps.commit-and-push.outcome == 'failure'
77-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
77+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
7878
with:
7979
comment-id: ${{ github.event.comment.id }}
8080
reactions: confused
8181

8282
- name: react if linting errors were not fixed
8383
if: steps.commit-and-push.outcome == 'failure'
84-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
84+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
8585
with:
8686
issue-number: ${{ github.event.issue.number }}
8787
body: |

.github/workflows/linting.yml

Lines changed: 9 additions & 12 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]
@@ -14,12 +11,12 @@ jobs:
1411
pre-commit:
1512
runs-on: ubuntu-latest
1613
steps:
17-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
14+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
1815

19-
- name: Set up Python 3.12
20-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
16+
- name: Set up Python 3.14
17+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
2118
with:
22-
python-version: "3.12"
19+
python-version: "3.14"
2320

2421
- name: Install pre-commit
2522
run: pip install pre-commit
@@ -31,18 +28,18 @@ jobs:
3128
runs-on: ubuntu-latest
3229
steps:
3330
- name: Check out pipeline code
34-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
31+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
3532

3633
- name: Install Nextflow
3734
uses: nf-core/setup-nextflow@v2
3835

39-
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
36+
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
4037
with:
41-
python-version: "3.12"
38+
python-version: "3.14"
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@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
7875
with:
7976
name: linting-logs
8077
path: |

0 commit comments

Comments
 (0)