You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Many thanks for taking an interest in improving sanger-tol/curationpretext.
@@ -9,22 +9,26 @@ Please use the pre-filled template to save time.
9
9
However, don't be put off by this template - other more general issues and suggestions are welcome!
10
10
Contributions to the code are even more welcome ;)
11
11
12
-
> If you need help using or modifying sanger-tol/curationpretext then the best place to ask is on the nf-core Slack [#curationpretext](https://nfcore.slack.com/channels/curationpretext) channel ([join our Slack here](https://nf-co.re/join/slack)).
13
-
14
12
## Contribution workflow
15
13
16
14
If you'd like to write some code for sanger-tol/curationpretext, the standard workflow is as follows:
17
15
18
16
1. Check that there isn't already an issue about your idea in the [sanger-tol/curationpretext issues](https://github.com/sanger-tol/curationpretext/issues) to avoid duplicating work. If there isn't one already, please create one so that others know you're working on this
19
-
2.[Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [sanger-tol/curationpretextxt repository](https://github.com/sanger-tol/curationpretext) to your GitHub account
17
+
2.[Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [sanger-tol/curationpretext repository](https://github.com/sanger-tol/curationpretext) to your GitHub account
20
18
3. Make the necessary changes / additions within your forked repository following [Pipeline conventions](#pipeline-contribution-conventions)
21
-
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).
19
+
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).
22
20
5. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged
23
21
24
22
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/).
25
23
26
24
## Tests
27
25
26
+
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:
27
+
28
+
```bash
29
+
nf-test test --profile debug,test,docker --verbose
30
+
```
31
+
28
32
When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests.
29
33
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then.
30
34
@@ -33,7 +37,7 @@ There are typically two types of tests that run:
33
37
### Lint tests
34
38
35
39
`nf-core` has a [set of guidelines](https://nf-co.re/developers/guidelines) which all pipelines must adhere to.
36
-
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.
40
+
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.
37
41
38
42
If any failures or warnings are encountered, please follow the listed URL for more documentation.
39
43
@@ -48,44 +52,38 @@ These tests are run both with the latest available version of `Nextflow` and als
48
52
49
53
:warning: Only in the unlikely and regretful event of a release happening with a bug.
50
54
51
-
- On your own fork, make a new branch `patch` based on `upstream/master`.
55
+
- On your own fork, make a new branch `patch` based on `upstream/main` or `upstream/master`.
52
56
- Fix the bug, and bump version (X.Y.Z+1).
53
-
- A PR should be made on `master` from patch to directly this particular bug.
54
-
55
-
## Getting help
56
-
57
-
For further information/help, please consult the [sanger-tol/curationpretext documentation](https://nf-co.re/curationpretext/usage) and don't hesitate to get in touch on the nf-core Slack [#curationpretext](https://nfcore.slack.com/channels/curationpretext) channel ([join our Slack here](https://nf-co.re/join/slack)).
57
+
- Open a pull-request from `patch` to `main`/`master` with the changes.
58
58
59
59
## Pipeline contribution conventions
60
60
61
-
To make the sanger-tol/curationpretext 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.
61
+
To make the `sanger-tol/curationpretext` 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.
62
62
63
63
### Adding a new step
64
64
65
65
If you wish to contribute a new step, please use the following coding standards:
66
66
67
-
1. Define the corresponding input channel into your new process from the expected previous process channel
67
+
1. Define the corresponding input channel into your new process from the expected previous process channel.
68
68
2. Write the process block (see below).
69
69
3. Define the output channel if needed (see below).
70
70
4. Add any new parameters to `nextflow.config` with a default (see below).
71
-
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core schema build` tool).
71
+
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core pipelines schema build` tool).
72
72
6. Add sanity checks and validation for all relevant parameters.
73
73
7. Perform local tests to validate that the new code works as expected.
74
74
8. If applicable, add a new test command in `.github/workflow/ci.yml`.
75
-
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.
76
-
10. Add a description of the output files and if relevant any appropriate images from the MultiQC report to `docs/output.md`.
77
75
78
76
### Default values
79
77
80
-
Parameters should be initialised / defined with default values in `nextflow.config` under the `params` scope.
78
+
Parameters should be initialised / defined with default values within the `params` scope in `nextflow.config`.
81
79
82
-
Once there, use `nf-core schema build` to add to `nextflow_schema.json`.
80
+
Once there, use `nf-core pipelines schema build` to add to `nextflow_schema.json`.
83
81
84
82
### Default processes resource requirements
85
83
86
-
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.
84
+
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.
87
85
88
-
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.
86
+
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.
89
87
90
88
### Naming schemes
91
89
@@ -96,24 +94,8 @@ Please use the following naming schemes, to make it easy to understand what is g
96
94
97
95
### Nextflow version bumping
98
96
99
-
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]`
97
+
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]`
100
98
101
99
### Images and figures
102
100
103
101
For overview images and other documents we follow the nf-core [style guidelines and examples](https://nf-co.re/developers/design_guidelines).
104
-
105
-
## GitHub Codespaces
106
-
107
-
This repo includes a devcontainer configuration which will create a GitHub Codespaces for Nextflow development! This is an online developer environment that runs in your browser, complete with VSCode and a terminal.
108
-
109
-
To get started:
110
-
111
-
- Open the repo in [Codespaces](https://github.com/sanger-tol/curationpretext/codespaces)
Copy file name to clipboardExpand all lines: .github/PULL_REQUEST_TEMPLATE.md
+3-2Lines changed: 3 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -8,17 +8,18 @@ These are the most common things requested on pull requests (PRs).
8
8
9
9
Remember that PRs should be made against the dev branch, unless you're preparing a pipeline release.
10
10
11
-
Learn more about contributing: [CONTRIBUTING.md](https://github.com/sanger-tol/curationpretext/tree/master/.github/CONTRIBUTING.md)
11
+
Learn more about contributing: [CONTRIBUTING.md](https://github.com/sanger-tol/curationpretext/tree/main/.github/CONTRIBUTING.md)
12
12
-->
13
13
14
14
## PR checklist
15
15
16
16
-[ ] This comment contains a description of changes (with reason).
17
17
-[ ] 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/sanger-tol/curationpretext/tree/master/.github/CONTRIBUTING.md)
18
+
-[ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/sanger-tol/curationpretext/tree/main/.github/CONTRIBUTING.md)
19
19
-[ ] If necessary, also make a PR on the sanger-tol/curationpretext _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
20
20
-[ ] Make sure your code lints (`nf-core lint`).
21
21
-[ ] 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>`).
22
23
-[ ] Usage Documentation in `docs/usage.md` is updated.
23
24
-[ ] Output Documentation in `docs/output.md` is updated.
## This PR is against the `${{github.event.pull_request.base.ref}}` branch :x:
26
28
27
29
* Do not close this PR
28
30
* Click _Edit_ and change the `base` to `dev`
@@ -32,9 +34,9 @@ jobs:
32
34
33
35
Hi @${{ github.event.pull_request.user.login }},
34
36
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.
38
40
39
41
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.
40
42
Note that even after this, the test will continue to show as failing until you push a new commit.
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."
16
16
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."
0 commit comments