Skip to content

Commit 48cb638

Browse files
authored
Merge pull request nf-core#140 from nf-core/nf-core-template-merge-2.14.1
Important! Template update for nf-core/tools v2.14.1
2 parents a833135 + d95d300 commit 48cb638

File tree

301 files changed

+11514
-4618
lines changed

Some content is hidden

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

301 files changed

+11514
-4618
lines changed

.devcontainer/devcontainer.json

+1-9
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,7 @@
1010
"vscode": {
1111
// Set *default* container specific settings.json values on container create.
1212
"settings": {
13-
"python.defaultInterpreterPath": "/opt/conda/bin/python",
14-
"python.linting.enabled": true,
15-
"python.linting.pylintEnabled": true,
16-
"python.formatting.autopep8Path": "/opt/conda/bin/autopep8",
17-
"python.formatting.yapfPath": "/opt/conda/bin/yapf",
18-
"python.linting.flake8Path": "/opt/conda/bin/flake8",
19-
"python.linting.pycodestylePath": "/opt/conda/bin/pycodestyle",
20-
"python.linting.pydocstylePath": "/opt/conda/bin/pydocstyle",
21-
"python.linting.pylintPath": "/opt/conda/bin/pylint"
13+
"python.defaultInterpreterPath": "/opt/conda/bin/python"
2214
},
2315

2416
// Add the IDs of extensions you want installed when the container is created.

.editorconfig

+7-6
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,16 @@ end_of_line = unset
1818
insert_final_newline = unset
1919
trim_trailing_whitespace = unset
2020
indent_style = unset
21-
indent_size = unset
21+
[/subworkflows/nf-core/**]
22+
charset = unset
23+
end_of_line = unset
24+
insert_final_newline = unset
25+
trim_trailing_whitespace = unset
26+
indent_style = unset
2227

2328
[/assets/email*]
2429
indent_size = unset
2530

26-
# ignore Readme
27-
[README.md]
28-
indent_style = unset
29-
30-
# ignore python and markdown (is taken care off by prettier)
31+
# ignore python and markdown
3132
[*.{py,md}]
3233
indent_style = unset

.github/CONTRIBUTING.md

+8-6
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ Please use the pre-filled template to save time.
99
However, don't be put off by this template - other more general issues and suggestions are welcome!
1010
Contributions to the code are even more welcome ;)
1111

12-
:::info
13-
If you need help using or modifying nf-core/rnavar then the best place to ask is on the nf-core Slack [#rnavar](https://nfcore.slack.com/channels/rnavar) channel ([join our Slack here](https://nf-co.re/join/slack)).
14-
:::
12+
> [!NOTE]
13+
> If you need help using or modifying nf-core/rnavar then the best place to ask is on the nf-core Slack [#rnavar](https://nfcore.slack.com/channels/rnavar) channel ([join our Slack here](https://nf-co.re/join/slack)).
1514
1615
## Contribution workflow
1716

@@ -27,8 +26,11 @@ If you're not used to this workflow with git, you can start with some [docs from
2726

2827
## Tests
2928

30-
You can optionally test your changes by running the pipeline locally. Then it is recommended to use the `debug` profile to
31-
receive warnings about process selectors and other debug info. Example: `nextflow run . -profile debug,test,docker --outdir <OUTDIR>`.
29+
You have the option to test your changes locally by running the pipeline. For receiving warnings about process selectors and other `debug` information, it is recommended to use the debug profile. Execute all the tests with the following command:
30+
31+
```bash
32+
nf-test test --profile debug,test,docker --verbose
33+
```
3234

3335
When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests.
3436
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then.
@@ -90,7 +92,7 @@ Once there, use `nf-core schema build` to add to `nextflow_schema.json`.
9092

9193
Sensible defaults for process resource requirements (CPUs / memory / time) for a process should be defined in `conf/base.config`. These should generally be specified generic with `withLabel:` selectors so they can be shared across multiple processes/steps of the pipeline. A nf-core standard set of labels that should be followed where possible can be seen in the [nf-core pipeline template](https://github.com/nf-core/tools/blob/master/nf_core/pipeline-template/conf/base.config), which has the default process as a single core-process, and then different levels of multi-core configurations for increasingly large memory requirements defined with standardised labels.
9294

93-
The process resources can be passed on to the tool dynamically within the process with the `${task.cpu}` and `${task.memory}` variables in the `script:` block.
95+
The process resources can be passed on to the tool dynamically within the process with the `${task.cpus}` and `${task.memory}` variables in the `script:` block.
9496

9597
### Naming schemes
9698

.github/workflows/awsfulltest.yml

+5-8
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@ on:
88
types: [published]
99
workflow_dispatch:
1010
jobs:
11-
run-tower:
11+
run-platform:
1212
name: Run AWS full tests
1313
if: github.repository == 'nf-core/rnavar'
1414
runs-on: ubuntu-latest
1515
steps:
16-
- name: Launch workflow via tower
16+
- name: Launch workflow via Seqera Platform
1717
uses: seqeralabs/action-tower-launch@v2
18-
# TODO nf-core: You can customise AWS full pipeline tests as required
19-
# Add full size test data (but still relatively small datasets for few samples)
20-
# on the `test_full.config` test runs with only one set of parameters
2118
with:
2219
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
2320
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
@@ -33,7 +30,7 @@ jobs:
3330

3431
- uses: actions/upload-artifact@v4
3532
with:
36-
name: Tower debug log file
33+
name: Seqera Platform debug log file
3734
path: |
38-
tower_action_*.log
39-
tower_action_*.json
35+
seqera_platform_action_*.log
36+
seqera_platform_action_*.json

.github/workflows/awstest.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ name: nf-core AWS test
55
on:
66
workflow_dispatch:
77
jobs:
8-
run-tower:
8+
run-platform:
99
name: Run AWS tests
1010
if: github.repository == 'nf-core/rnavar'
1111
runs-on: ubuntu-latest
1212
steps:
13-
# Launch workflow using Tower CLI tool action
14-
- name: Launch workflow via tower
13+
# Launch workflow using Seqera Platform CLI tool action
14+
- name: Launch workflow via Seqera Platform
1515
uses: seqeralabs/action-tower-launch@v2
1616
with:
1717
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
@@ -27,7 +27,7 @@ jobs:
2727

2828
- uses: actions/upload-artifact@v4
2929
with:
30-
name: Tower debug log file
30+
name: Seqera Platform debug log file
3131
path: |
32-
tower_action_*.log
33-
tower_action_*.json
32+
seqera_platform_action_*.log
33+
seqera_platform_action_*.json

.github/workflows/branch.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
2020
- name: Post PR comment
2121
if: failure()
22-
uses: mshick/add-pr-comment@v2
22+
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2
2323
with:
2424
message: |
2525
## This PR is against the `master` branch :x:

.github/workflows/ci.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@ jobs:
3434
- "bamcsiindex"
3535
steps:
3636
- name: Check out pipeline code
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
3838

3939
- name: Install Nextflow
40-
uses: nf-core/setup-nextflow@v1
40+
uses: nf-core/setup-nextflow@v2
4141
with:
4242
version: "${{ matrix.NXF_VER }}"
4343

44+
- name: Disk space cleanup
45+
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
46+
4447
- name: Set up Python
4548
uses: actions/setup-python@v2
4649
with:

.github/workflows/clean-up.yml

+1-1
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@v9
13+
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # 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

+26-7
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,16 @@ name: Test successful pipeline download with 'nf-core download'
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:
9+
inputs:
10+
testbranch:
11+
description: "The specific branch you wish to utilize for the test execution of nf-core download."
12+
required: true
13+
default: "dev"
914
pull_request:
1015
types:
1116
- opened
17+
- edited
18+
- synchronize
1219
branches:
1320
- master
1421
pull_request_target:
@@ -23,13 +30,16 @@ jobs:
2330
runs-on: ubuntu-latest
2431
steps:
2532
- name: Install Nextflow
26-
uses: nf-core/setup-nextflow@v1
33+
uses: nf-core/setup-nextflow@v2
2734

28-
- uses: actions/setup-python@v5
35+
- name: Disk space cleanup
36+
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
37+
38+
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
2939
with:
30-
python-version: "3.11"
40+
python-version: "3.12"
3141
architecture: "x64"
32-
- uses: eWaterCycle/setup-singularity@v7
42+
- uses: eWaterCycle/setup-singularity@931d4e31109e875b13309ae1d07c70ca8fbc8537 # v7
3343
with:
3444
singularity-version: 3.8.3
3545

@@ -42,13 +52,13 @@ jobs:
4252
run: |
4353
echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV}
4454
echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> ${GITHUB_ENV}
45-
echo "REPO_BRANCH=${GITHUB_REF#refs/heads/}" >> ${GITHUB_ENV}
55+
echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> ${GITHUB_ENV}
4656
4757
- name: Download the pipeline
4858
env:
4959
NXF_SINGULARITY_CACHEDIR: ./
5060
run: |
51-
nf-core download ${{ env.REPO_LOWERCASE }} \
61+
nf-core download ${{ env.REPO_LOWERCASE }} \
5262
--revision ${{ env.REPO_BRANCH }} \
5363
--outdir ./${{ env.REPOTITLE_LOWERCASE }} \
5464
--compress "none" \
@@ -60,8 +70,17 @@ jobs:
6070
- name: Inspect download
6171
run: tree ./${{ env.REPOTITLE_LOWERCASE }}
6272

63-
- name: Run the downloaded pipeline
73+
- name: Run the downloaded pipeline (stub)
74+
id: stub_run_pipeline
75+
continue-on-error: true
6476
env:
6577
NXF_SINGULARITY_CACHEDIR: ./
6678
NXF_SINGULARITY_HOME_MOUNT: true
6779
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results
80+
- name: Run the downloaded pipeline (stub run not supported)
81+
id: run_pipeline
82+
if: ${{ job.steps.stub_run_pipeline.status == failure() }}
83+
env:
84+
NXF_SINGULARITY_CACHEDIR: ./
85+
NXF_SINGULARITY_HOME_MOUNT: true
86+
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -profile test,singularity --outdir ./results

.github/workflows/fix-linting.yml

+3-3
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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
16+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
1717
with:
1818
token: ${{ secrets.nf_core_bot_auth_token }}
1919

@@ -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@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
35+
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
3636
with:
37-
python-version: 3.11
37+
python-version: "3.12"
3838

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

.github/workflows/linting.yml

+9-10
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@ jobs:
1414
pre-commit:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
1818

19-
- name: Set up Python 3.11
20-
uses: actions/setup-python@v5
19+
- name: Set up Python 3.12
20+
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
2121
with:
22-
python-version: 3.11
23-
cache: "pip"
22+
python-version: "3.12"
2423

2524
- name: Install pre-commit
2625
run: pip install pre-commit
@@ -32,14 +31,14 @@ jobs:
3231
runs-on: ubuntu-latest
3332
steps:
3433
- name: Check out pipeline code
35-
uses: actions/checkout@v4
34+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
3635

3736
- name: Install Nextflow
38-
uses: nf-core/setup-nextflow@v1
37+
uses: nf-core/setup-nextflow@v2
3938

40-
- uses: actions/setup-python@v5
39+
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
4140
with:
42-
python-version: "3.11"
41+
python-version: "3.12"
4342
architecture: "x64"
4443

4544
- name: Install dependencies
@@ -60,7 +59,7 @@ jobs:
6059

6160
- name: Upload linting log file artifact
6261
if: ${{ always() }}
63-
uses: actions/upload-artifact@v4
62+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
6463
with:
6564
name: linting-logs
6665
path: |

.github/workflows/linting_comment.yml

+2-2
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@v3
14+
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3
1515
with:
1616
workflow: linting.yml
1717
workflow_conclusion: completed
@@ -21,7 +21,7 @@ jobs:
2121
run: echo "pr_number=$(cat linting-logs/PR_number.txt)" >> $GITHUB_OUTPUT
2222

2323
- name: Post PR comment
24-
uses: marocchino/sticky-pull-request-comment@v2
24+
uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2
2525
with:
2626
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2727
number: ${{ steps.pr_number.outputs.pr_number }}

.github/workflows/release-announcements.yml

+9-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ jobs:
99
toot:
1010
runs-on: ubuntu-latest
1111
steps:
12+
- name: get topics and convert to hashtags
13+
id: get_topics
14+
run: |
15+
echo "topics=$(curl -s https://nf-co.re/pipelines.json | jq -r '.remote_workflows[] | select(.full_name == "${{ github.repository }}") | .topics[]' | awk '{print "#"$0}' | tr '\n' ' ')" >> $GITHUB_OUTPUT
16+
1217
- uses: rzr/fediverse-action@master
1318
with:
1419
access-token: ${{ secrets.MASTODON_ACCESS_TOKEN }}
@@ -20,11 +25,13 @@ jobs:
2025
2126
Please see the changelog: ${{ github.event.release.html_url }}
2227
28+
${{ steps.get_topics.outputs.topics }} #nfcore #openscience #nextflow #bioinformatics
29+
2330
send-tweet:
2431
runs-on: ubuntu-latest
2532

2633
steps:
27-
- uses: actions/setup-python@v5
34+
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
2835
with:
2936
python-version: "3.10"
3037
- name: Install dependencies
@@ -56,7 +63,7 @@ jobs:
5663
bsky-post:
5764
runs-on: ubuntu-latest
5865
steps:
59-
- uses: zentered/[email protected]
66+
- uses: zentered/bluesky-post-action@80dbe0a7697de18c15ad22f4619919ceb5ccf597 # v0.1.0
6067
with:
6168
post: |
6269
Pipeline release! ${{ github.repository }} v${{ github.event.release.tag_name }} - ${{ github.event.release.name }}!

.gitpod.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@ tasks:
1010
1111
vscode:
1212
extensions: # based on nf-core.nf-core-extensionpack
13-
- codezombiech.gitignore # Language support for .gitignore files
14-
# - cssho.vscode-svgviewer # SVG viewer
1513
- esbenp.prettier-vscode # Markdown/CommonMark linting and style checking for Visual Studio Code
16-
- eamodio.gitlens # Quickly glimpse into whom, why, and when a line or code block was changed
1714
- EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files
1815
- Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar
1916
- mechatroner.rainbow-csv # Highlight columns in csv files in different colors
20-
# - nextflow.nextflow # Nextflow syntax highlighting
17+
# - nextflow.nextflow # Nextflow syntax highlighting
2118
- oderwat.indent-rainbow # Highlight indentation level
2219
- streetsidesoftware.code-spell-checker # Spelling checker for source code
20+
- charliermarsh.ruff # Code linter Ruff

.nf-core.yml

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,2 @@
11
repository_type: pipeline
2-
lint:
3-
files_exist:
4-
- lib/NfcoreTemplate.groovy
5-
- lib/Utils.groovy
6-
- lib/WorkflowMain.groovy
7-
- lib/WorkflowRnavar.groovy
8-
files_unchanged:
9-
- .github/CONTRIBUTING.md
10-
- .github/workflows/branch.yml
11-
- .github/workflows/linting.yml
12-
- .github/workflows/linting_comment.yml
13-
- docs/images/nf-core-rnavar_logo_light.png
2+
nf_core_version: "2.14.1"

0 commit comments

Comments
 (0)