Skip to content

Commit b175040

Browse files
authored
Merge pull request #321 from nf-core/add_template_to_dev_first
update to Template 3.2.1 and all nf-core/modules; add dorado + ToulligQC; remove DNA functionalities
2 parents 31def65 + 43d5c0c commit b175040

File tree

271 files changed

+14888
-5718
lines changed

Some content is hidden

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

271 files changed

+14888
-5718
lines changed

.github/CONTRIBUTING.md

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

33
Hi there!
44
Many thanks for taking an interest in improving nf-core/nanoseq.
@@ -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/nanoseq then the best place to ask is on the nf-core Slack [#nanoseq](https://nfcore.slack.com/channels/nanoseq) channel ([join our Slack here](https://nf-co.re/join/slack)).
14-
:::
12+
> [!NOTE]
13+
> If you need help using or modifying nf-core/nanoseq then the best place to ask is on the nf-core Slack [#nanoseq](https://nfcore.slack.com/channels/nanoseq) channel ([join our Slack here](https://nf-co.re/join/slack)).
1514
1615
## Contribution workflow
1716

@@ -20,13 +19,19 @@ If you'd like to write some code for nf-core/nanoseq, the standard workflow is a
2019
1. Check that there isn't already an issue about your idea in the [nf-core/nanoseq issues](https://github.com/nf-core/nanoseq/issues) to avoid duplicating work. If there isn't one already, please create one so that others know you're working on this
2120
2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [nf-core/nanoseq repository](https://github.com/nf-core/nanoseq) to your GitHub account
2221
3. Make the necessary changes / additions within your forked repository following [Pipeline conventions](#pipeline-contribution-conventions)
23-
4. Use `nf-core schema build` and add any new parameters to the pipeline JSON schema (requires [nf-core tools](https://github.com/nf-core/tools) >= 1.10).
22+
4. Use `nf-core pipelines schema build` and add any new parameters to the pipeline JSON schema (requires [nf-core tools](https://github.com/nf-core/tools) >= 1.10).
2423
5. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged
2524

2625
If you're not used to this workflow with git, you can start with some [docs from GitHub](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests) or even their [excellent `git` resources](https://try.github.io/).
2726

2827
## Tests
2928

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+
```
34+
3035
When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests.
3136
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then.
3237

@@ -35,7 +40,7 @@ There are typically two types of tests that run:
3540
### Lint tests
3641

3742
`nf-core` has a [set of guidelines](https://nf-co.re/developers/guidelines) which all pipelines must adhere to.
38-
To enforce these and ensure that all pipelines stay in sync, we have developed a helper tool which runs checks on the pipeline code. This is in the [nf-core/tools repository](https://github.com/nf-core/tools) and once installed can be run locally with the `nf-core lint <pipeline-directory>` command.
43+
To enforce these and ensure that all pipelines stay in sync, we have developed a helper tool which runs checks on the pipeline code. This is in the [nf-core/tools repository](https://github.com/nf-core/tools) and once installed can be run locally with the `nf-core pipelines lint <pipeline-directory>` command.
3944

4045
If any failures or warnings are encountered, please follow the listed URL for more documentation.
4146

@@ -50,27 +55,27 @@ These tests are run both with the latest available version of `Nextflow` and als
5055

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

53-
- 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`.
5459
- Fix the bug, and bump version (X.Y.Z+1).
55-
- 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.
5661

5762
## Getting help
5863

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

6166
## Pipeline contribution conventions
6267

63-
To make the nf-core/nanoseq 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/nanoseq` 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.
6469

6570
### Adding a new step
6671

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

69-
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.
7075
2. Write the process block (see below).
7176
3. Define the output channel if needed (see below).
7277
4. Add any new parameters to `nextflow.config` with a default (see below).
73-
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core schema build` tool).
78+
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core pipelines schema build` tool).
7479
6. Add sanity checks and validation for all relevant parameters.
7580
7. Perform local tests to validate that the new code works as expected.
7681
8. If applicable, add a new test command in `.github/workflow/ci.yml`.
@@ -79,15 +84,15 @@ If you wish to contribute a new step, please use the following coding standards:
7984

8085
### Default values
8186

82-
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`.
8388

84-
Once there, use `nf-core schema build` to add to `nextflow_schema.json`.
89+
Once there, use `nf-core pipelines schema build` to add to `nextflow_schema.json`.
8590

8691
### Default processes resource requirements
8792

88-
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.
93+
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/main/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.
8994

90-
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.
9196

9297
### Naming schemes
9398

@@ -98,7 +103,7 @@ Please use the following naming schemes, to make it easy to understand what is g
98103

99104
### Nextflow version bumping
100105

101-
If you are using a new feature from core Nextflow, you may bump the minimum required version of nextflow in the pipeline with: `nf-core bump-version --nextflow . [min-nf-version]`
106+
If you are using a new feature from core Nextflow, you may bump the minimum required version of nextflow in the pipeline with: `nf-core pipelines bump-version --nextflow . [min-nf-version]`
102107

103108
### Images and figures
104109

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ body:
99
1010
- [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting)
1111
- [nf-core/nanoseq pipeline documentation](https://nf-co.re/nanoseq/usage)
12-
1312
- type: textarea
1413
id: description
1514
attributes:

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/nano
1717
- [ ] If you've fixed a bug or added code that should be tested, add tests!
1818
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/nanoseq/tree/master/.github/CONTRIBUTING.md)
1919
- [ ] If necessary, also make a PR on the nf-core/nanoseq _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
20-
- [ ] Make sure your code lints (`nf-core lint`).
20+
- [ ] Make sure your code lints (`nf-core pipelines lint`).
2121
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
22+
- [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir <OUTDIR>`).
2223
- [ ] Usage Documentation in `docs/usage.md` is updated.
2324
- [ ] Output Documentation in `docs/output.md` is updated.
2425
- [ ] `CHANGELOG.md` is updated.

.github/workflows/awsfulltest.yml

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,48 @@
11
name: nf-core AWS full size tests
2-
# This workflow is triggered on published releases.
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:
7+
workflow_dispatch:
8+
pull_request_review:
9+
types: [submitted]
710
release:
811
types: [published]
9-
workflow_dispatch:
12+
1013
jobs:
11-
run-tower:
14+
run-platform:
1215
name: Run AWS full tests
13-
if: github.repository == 'nf-core/nanoseq'
16+
# 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/nanoseq' && github.event.review.state == 'approved' && (github.event.pull_request.base.ref == 'master' || github.event.pull_request.base.ref == 'main') || github.event_name == 'workflow_dispatch'
1418
runs-on: ubuntu-latest
1519
steps:
16-
- name: Launch workflow via tower
17-
uses: seqeralabs/action-tower-launch@v1
20+
- name: Set revision variable
21+
id: revision
22+
run: |
23+
echo "revision=${{ (github.event_name == 'workflow_dispatch' || github.event_name == 'release') && github.sha || 'dev' }}" >> "$GITHUB_OUTPUT"
24+
25+
- name: Launch workflow via Seqera Platform
26+
uses: seqeralabs/action-tower-launch@v2
1827
# TODO nf-core: You can customise AWS full pipeline tests as required
1928
# Add full size test data (but still relatively small datasets for few samples)
2029
# on the `test_full.config` test runs with only one set of parameters
2130
with:
2231
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
2332
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
2433
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
25-
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/nanoseq/work-${{ github.sha }}
34+
revision: ${{ steps.revision.outputs.revision }}
35+
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/nanoseq/work-${{ steps.revision.outputs.revision }}
2636
parameters: |
2737
{
28-
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/nanoseq/results-${{ github.sha }}"
38+
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
39+
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/nanoseq/results-${{ steps.revision.outputs.revision }}"
2940
}
30-
profiles: test_full,aws_tower
31-
- uses: actions/upload-artifact@v3
41+
profiles: test_full
42+
43+
- uses: actions/upload-artifact@v4
3244
with:
33-
name: Tower debug log file
34-
path: tower_action_*.log
45+
name: Seqera Platform debug log file
46+
path: |
47+
seqera_platform_action_*.log
48+
seqera_platform_action_*.json

.github/workflows/awstest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/nanoseq/results-test-${{ github.sha }}"
2424
}
2525
profiles: test,aws_tower
26-
- uses: actions/upload-artifact@v3
26+
- uses: actions/upload-artifact@v4
2727
with:
2828
name: Tower debug log file
2929
path: tower_action_*.log

.github/workflows/branch.yml

Lines changed: 11 additions & 9 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/nanoseq'
1517
run: |
@@ -19,10 +21,10 @@ jobs:
1921
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
2022
- name: Post PR comment
2123
if: failure()
22-
uses: mshick/add-pr-comment@v1
24+
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: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ jobs:
2424
strategy:
2525
matrix:
2626
NXF_VER:
27-
- "22.10.1"
27+
- "24.04.2"
2828
- "latest-everything"
2929
steps:
3030
- name: Check out pipeline code
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
3232

3333
- name: Install Nextflow
3434
uses: nf-core/setup-nextflow@v1
@@ -44,18 +44,17 @@ jobs:
4444
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/nanoseq') }}"
4545
runs-on: ubuntu-latest
4646
env:
47-
NXF_VER: "22.10.3"
47+
NXF_VER: "24.04.2"
4848
NXF_ANSI_LOG: false
4949
strategy:
5050
matrix:
5151
profiles:
52-
- "test_nodx_vc"
53-
- "test_nodx_stringtie"
54-
- "test_nodx_noaln"
55-
- "test_nodx_rnamod"
52+
- "test_nobc_nodx_stringtie"
53+
- "test_nobc_nodx_noaln"
54+
- "test_nobc_nodx_rnamod"
5655
steps:
5756
- name: Check out pipeline code
58-
uses: actions/checkout@v3
57+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
5958

6059
- name: Install Nextflow
6160
uses: nf-core/setup-nextflow@v1
@@ -71,7 +70,7 @@ jobs:
7170
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/nanoseq') }}"
7271
runs-on: ubuntu-latest
7372
env:
74-
NXF_VER: "22.10.3"
73+
NXF_VER: "24.04.2"
7574
NXF_ANSI_LOG: false
7675
strategy:
7776
matrix:
@@ -82,7 +81,7 @@ jobs:
8281
- "--skip_quantification"
8382
steps:
8483
- name: Check out pipeline code
85-
uses: actions/checkout@v2
84+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
8685

8786
- name: Install Nextflow
8887
env:

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

@@ -24,7 +24,7 @@ jobs:
2424
env:
2525
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}
2626

27-
- uses: actions/setup-node@v3
27+
- uses: actions/setup-node@v4
2828

2929
- name: Install Prettier
3030
run: npm install -g prettier @prettier/plugin-php

0 commit comments

Comments
 (0)