Skip to content

Commit 903bebe

Browse files
committed
Template update for nf-core/tools version 3.1.0
1 parent 240c46a commit 903bebe

Some content is hidden

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

57 files changed

+642
-332
lines changed

.github/CONTRIBUTING.md

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
# nf-core/plantpathsurveil: Contributing Guidelines
1+
# `nf-core/pathogensurveillance`: Contributing Guidelines
22

33
Hi there!
4-
Many thanks for taking an interest in improving nf-core/plantpathsurveil.
4+
Many thanks for taking an interest in improving nf-core/pathogensurveillance.
55

6-
We try to manage the required tasks for nf-core/plantpathsurveil using GitHub issues, you probably came to this page when creating one.
6+
We try to manage the required tasks for nf-core/pathogensurveillance using GitHub issues, you probably came to this page when creating one.
77
Please use the pre-filled template to save time.
88

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

1212
> [!NOTE]
13-
> If you need help using or modifying nf-core/plantpathsurveil then the best place to ask is on the nf-core Slack [#plantpathsurveil](https://nfcore.slack.com/channels/plantpathsurveil) channel ([join our Slack here](https://nf-co.re/join/slack)).
13+
> If you need help using or modifying nf-core/pathogensurveillance then the best place to ask is on the nf-core Slack [#pathogensurveillance](https://nfcore.slack.com/channels/pathogensurveillance) channel ([join our Slack here](https://nf-co.re/join/slack)).
1414
1515
## Contribution workflow
1616

17-
If you'd like to write some code for nf-core/plantpathsurveil, the standard workflow is as follows:
17+
If you'd like to write some code for nf-core/pathogensurveillance, the standard workflow is as follows:
1818

19-
1. Check that there isn't already an issue about your idea in the [nf-core/plantpathsurveil issues](https://github.com/nf-core/plantpathsurveil/issues) to avoid duplicating work. If there isn't one already, please create one so that others know you're working on this
20-
2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [nf-core/plantpathsurveil repository](https://github.com/nf-core/plantpathsurveil) to your GitHub account
19+
1. Check that there isn't already an issue about your idea in the [nf-core/pathogensurveillance issues](https://github.com/nf-core/pathogensurveillance/issues) to avoid duplicating work. If there isn't one already, please create one so that others know you're working on this
20+
2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [nf-core/pathogensurveillance repository](https://github.com/nf-core/pathogensurveillance) to your GitHub account
2121
3. Make the necessary changes / additions within your forked repository following [Pipeline conventions](#pipeline-contribution-conventions)
2222
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).
2323
5. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged
@@ -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

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

6666
## Pipeline contribution conventions
6767

68-
To make the nf-core/plantpathsurveil 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/pathogensurveillance` 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

@@ -115,7 +115,7 @@ This repo includes a devcontainer configuration which will create a GitHub Codes
115115

116116
To get started:
117117

118-
- Open the repo in [Codespaces](https://github.com/nf-core/plantpathsurveil/codespaces)
118+
- Open the repo in [Codespaces](https://github.com/nf-core/pathogensurveillance/codespaces)
119119
- Tools installed
120120
- nf-core
121121
- Nextflow

.github/ISSUE_TEMPLATE/bug_report.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ body:
88
Before you post this issue, please check the documentation:
99
1010
- [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting)
11-
- [nf-core/plantpathsurveil pipeline documentation](https://nf-co.re/plantpathsurveil/usage)
11+
- [nf-core/pathogensurveillance pipeline documentation](https://nf-co.re/pathogensurveillance/usage)
1212
1313
- type: textarea
1414
id: description
@@ -47,4 +47,4 @@ body:
4747
* Executor _(eg. slurm, local, awsbatch)_
4848
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter, Charliecloud, or Apptainer)_
4949
* OS _(eg. CentOS Linux, macOS, Linux Mint)_
50-
* Version of nf-core/plantpathsurveil _(eg. 1.1, 1.5, 1.8.2)_
50+
* Version of nf-core/pathogensurveillance _(eg. 1.1, 1.5, 1.8.2)_

.github/ISSUE_TEMPLATE/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ contact_links:
22
- name: Join nf-core
33
url: https://nf-co.re/join
44
about: Please join the nf-core community here
5-
- name: "Slack #plantpathsurveil channel"
6-
url: https://nfcore.slack.com/channels/plantpathsurveil
7-
about: Discussion about the nf-core/plantpathsurveil pipeline
5+
- name: "Slack #pathogensurveillance channel"
6+
url: https://nfcore.slack.com/channels/pathogensurveillance
7+
about: Discussion about the nf-core/pathogensurveillance pipeline

.github/ISSUE_TEMPLATE/feature_request.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Feature request
2-
description: Suggest an idea for the nf-core/plantpathsurveil pipeline
2+
description: Suggest an idea for the nf-core/pathogensurveillance pipeline
33
labels: enhancement
44
body:
55
- type: textarea

.github/PULL_REQUEST_TEMPLATE.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<!--
2-
# nf-core/plantpathsurveil pull request
2+
# nf-core/pathogensurveillance pull request
33
4-
Many thanks for contributing to nf-core/plantpathsurveil!
4+
Many thanks for contributing to nf-core/pathogensurveillance!
55
66
Please fill in the appropriate checklist below (delete whatever is not relevant).
77
These are the most common things requested on pull requests (PRs).
88
99
Remember that PRs should be made against the dev branch, unless you're preparing a pipeline release.
1010
11-
Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/plantpathsurveil/tree/master/.github/CONTRIBUTING.md)
11+
Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/pathogensurveillance/tree/master/.github/CONTRIBUTING.md)
1212
-->
1313

1414
## PR checklist
1515

1616
- [ ] This comment contains a description of changes (with reason).
1717
- [ ] If you've fixed a bug or added code that should be tested, add tests!
18-
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/plantpathsurveil/tree/master/.github/CONTRIBUTING.md)
19-
- [ ] If necessary, also make a PR on the nf-core/plantpathsurveil _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
18+
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/pathogensurveillance/tree/master/.github/CONTRIBUTING.md)
19+
- [ ] If necessary, also make a PR on the nf-core/pathogensurveillance _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
2020
- [ ] Make sure your code lints (`nf-core pipelines lint`).
2121
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
2222
- [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir <OUTDIR>`).

.github/workflows/awsfulltest.yml

+20-7
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:
@@ -15,21 +16,33 @@ jobs:
1516
run-platform:
1617
name: Run AWS full tests
1718
# run only if the PR is approved by at least 2 reviewers and against the master branch or manually triggered
18-
if: github.repository == 'nf-core/plantpathsurveil' && github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'master' || github.event_name == 'workflow_dispatch'
19+
if: github.repository == 'nf-core/pathogensurveillance' && 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]
24+
if: github.event_name != 'workflow_dispatch'
2225
id: check_approvals
26+
continue-on-error: true
2327
with:
24-
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews
28+
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews?per_page=100
2529
env:
2630
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27-
- 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
2840
if: github.event_name != 'workflow_dispatch'
2941
run: |
3042
JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}'
3143
CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length')
3244
test $CURRENT_APPROVALS_COUNT -ge 2 || exit 1 # At least 2 approvals are required
45+
3346
- name: Launch workflow via Seqera Platform
3447
uses: seqeralabs/action-tower-launch@v2
3548
# TODO nf-core: You can customise AWS full pipeline tests as required
@@ -40,11 +53,11 @@ jobs:
4053
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
4154
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
4255
revision: ${{ github.sha }}
43-
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/plantpathsurveil/work-${{ github.sha }}
56+
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/pathogensurveillance/work-${{ github.sha }}
4457
parameters: |
4558
{
4659
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
47-
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/plantpathsurveil/results-${{ github.sha }}"
60+
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/pathogensurveillance/results-${{ github.sha }}"
4861
}
4962
profiles: test_full
5063

.github/workflows/awstest.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
run-platform:
99
name: Run AWS tests
10-
if: github.repository == 'nf-core/plantpathsurveil'
10+
if: github.repository == 'nf-core/pathogensurveillance'
1111
runs-on: ubuntu-latest
1212
steps:
1313
# Launch workflow using Seqera Platform CLI tool action
@@ -18,10 +18,10 @@ jobs:
1818
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
1919
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
2020
revision: ${{ github.sha }}
21-
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/plantpathsurveil/work-${{ github.sha }}
21+
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/pathogensurveillance/work-${{ github.sha }}
2222
parameters: |
2323
{
24-
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/plantpathsurveil/results-test-${{ github.sha }}"
24+
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/pathogensurveillance/results-test-${{ github.sha }}"
2525
}
2626
profiles: test
2727

.github/workflows/branch.yml

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
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
14-
if: github.repository == 'nf-core/plantpathsurveil'
16+
if: github.repository == 'nf-core/pathogensurveillance'
1517
run: |
16-
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/plantpathsurveil ]] && [[ $GITHUB_HEAD_REF == "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
18+
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/pathogensurveillance ]] && [[ $GITHUB_HEAD_REF == "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
1719
1820
# If the above check failed, post a comment on the PR explaining the failure
1921
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
@@ -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

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
test:
2323
name: "Run pipeline with test data (${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }})"
2424
# Only run on push if this is the nf-core dev branch (merged PRs)
25-
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/plantpathsurveil') }}"
25+
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/pathogensurveillance') }}"
2626
runs-on: ubuntu-latest
2727
strategy:
2828
matrix:
@@ -45,7 +45,7 @@ jobs:
4545
profile: "singularity"
4646
steps:
4747
- name: Check out pipeline code
48-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
48+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
4949

5050
- name: Set up Nextflow
5151
uses: nf-core/setup-nextflow@v2

.github/workflows/download_pipeline.yml

+5-3
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

0 commit comments

Comments
 (0)