Skip to content

Commit 9d3d074

Browse files
authored
Merge pull request #3302 from LouisLeNezet/documentation
Improve documentation writing
2 parents be5f2e2 + ac5497a commit 9d3d074

File tree

3 files changed

+18
-21
lines changed

3 files changed

+18
-21
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
- Remove `def` from `nextflow.config` and add `trace_report_suffix` param ([#3296](https://github.com/nf-core/tools/pull/3296))
1414
- Move `includeConfig 'conf/modules.config'` next to `includeConfig 'conf/base.config'` to not overwrite tests profiles configurations ([#3301](https://github.com/nf-core/tools/pull/3301))
1515
- Use `params.monochrome_logs` in the template and update nf-core components ([#3310](https://github.com/nf-core/tools/pull/3310))
16+
- Fix some typos and improve writing in `usage.md` and `CONTRIBUTING.md` ([#3302](https://github.com/nf-core/tools/pull/3302))
1617
- Add `manifest.contributors` to `nextflow.config` ([#3311](https://github.com/nf-core/tools/pull/3311))
1718

1819
### Download

nf_core/pipeline-template/.github/CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# {{ name }}: Contributing Guidelines
1+
# `{{ name }}`: Contributing Guidelines
22

33
Hi there!
44
Many thanks for taking an interest in improving {{ name }}.
@@ -66,7 +66,7 @@ These tests are run both with the latest available version of `Nextflow` and als
6666

6767
- On your own fork, make a new branch `patch` based on `upstream/master`.
6868
- Fix the bug, and bump version (X.Y.Z+1).
69-
- A PR should be made on `master` from patch to directly this particular bug.
69+
- Open a pull-request from `patch` to `master` with the changes.
7070

7171
{% if is_nfcore -%}
7272

@@ -78,13 +78,13 @@ For further information/help, please consult the [{{ name }} documentation](http
7878

7979
## Pipeline contribution conventions
8080

81-
To make the {{ name }} 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.
81+
To make the `{{ name }}` 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.
8282

8383
### Adding a new step
8484

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

87-
1. Define the corresponding input channel into your new process from the expected previous process channel
87+
1. Define the corresponding input channel into your new process from the expected previous process channel.
8888
2. Write the process block (see below).
8989
3. Define the output channel if needed (see below).
9090
4. Add any new parameters to `nextflow.config` with a default (see below).
@@ -99,7 +99,7 @@ If you wish to contribute a new step, please use the following coding standards:
9999

100100
### Default values
101101

102-
Parameters should be initialised / defined with default values in `nextflow.config` under the `params` scope.
102+
Parameters should be initialised / defined with default values within the `params` scope in `nextflow.config`.
103103

104104
Once there, use `nf-core pipelines schema build` to add to `nextflow_schema.json`.
105105

nf_core/pipeline-template/docs/usage.md

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,8 @@ If you wish to repeatedly use the same parameters for multiple runs, rather than
7979

8080
Pipeline settings can be provided in a `yaml` or `json` file via `-params-file <file>`.
8181

82-
:::warning
83-
Do not use `-c <file>` to specify parameters as this will result in errors. Custom config files specified with `-c` must only be used for [tuning process resource specifications](https://nf-co.re/docs/usage/configuration#tuning-workflow-resources), other infrastructural tweaks (such as output directories), or module arguments (args).
84-
:::
82+
> [!WARNING]
83+
> Do not use `-c <file>` to specify parameters as this will result in errors. Custom config files specified with `-c` must only be used for [tuning process resource specifications](https://nf-co.re/docs/usage/configuration#tuning-workflow-resources), other infrastructural tweaks (such as output directories), or module arguments (args).
8584
8685
The above pipeline run specified with a params file in yaml format:
8786

@@ -110,37 +109,34 @@ nextflow pull {{ name }}
110109

111110
### Reproducibility
112111

113-
It is a good idea to specify a pipeline version when running the pipeline on your data. This ensures that a specific version of the pipeline code and software are used when you run your pipeline. If you keep using the same tag, you'll be running the same version of the pipeline, even if there have been changes to the code since.
112+
It is a good idea to specify the pipeline version when running the pipeline on your data. This ensures that a specific version of the pipeline code and software are used when you run your pipeline. If you keep using the same tag, you'll be running the same version of the pipeline, even if there have been changes to the code since.
114113

115114
First, go to the [{{ name }} releases page](https://github.com/{{ name }}/releases) and find the latest pipeline version - numeric only (eg. `1.3.1`). Then specify this when running the pipeline with `-r` (one hyphen) - eg. `-r 1.3.1`. Of course, you can switch to another version by changing the number after the `-r` flag.
116115

117116
This version number will be logged in reports when you run the pipeline, so that you'll know what you used when you look back in the future. {% if multiqc %}For example, at the bottom of the MultiQC reports.{% endif %}
118117

119118
To further assist in reproducibility, you can use share and reuse [parameter files](#running-the-pipeline) to repeat pipeline runs with the same settings without having to write out a command with every single parameter.
120119

121-
:::tip
122-
If you wish to share such profile (such as upload as supplementary material for academic publications), make sure to NOT include cluster specific paths to files, nor institutional specific profiles.
123-
:::
120+
> [!TIP]
121+
> If you wish to share such profile (such as upload as supplementary material for academic publications), make sure to NOT include cluster specific paths to files, nor institutional specific profiles.
124122
125123
## Core Nextflow arguments
126124

127-
:::note
128-
These options are part of Nextflow and use a _single_ hyphen (pipeline parameters use a double-hyphen).
129-
:::
125+
> [!NOTE]
126+
> These options are part of Nextflow and use a _single_ hyphen (pipeline parameters use a double-hyphen)
130127
131128
### `-profile`
132129

133130
Use this parameter to choose a configuration profile. Profiles can give configuration presets for different compute environments.
134131

135132
Several generic profiles are bundled with the pipeline which instruct the pipeline to use software packaged using different methods (Docker, Singularity, Podman, Shifter, Charliecloud, Apptainer, Conda) - see below.
136133

137-
:::info
138-
We highly recommend the use of Docker or Singularity containers for full pipeline reproducibility, however when this is not possible, Conda is also supported.
139-
:::
134+
> [!IMPORTANT]
135+
> We highly recommend the use of Docker or Singularity containers for full pipeline reproducibility, however when this is not possible, Conda is also supported.
140136
141137
{%- if nf_core_configs %}
142138

143-
The pipeline also dynamically loads configurations from [https://github.com/nf-core/configs](https://github.com/nf-core/configs) when it runs, making multiple config profiles for various institutional clusters available at run time. For more information and to see if your system is available in these configs please see the [nf-core/configs documentation](https://github.com/nf-core/configs#documentation).
139+
The pipeline also dynamically loads configurations from [https://github.com/nf-core/configs](https://github.com/nf-core/configs) when it runs, making multiple config profiles for various institutional clusters available at run time. For more information and to check if your system is suported, please see the [nf-core/configs documentation](https://github.com/nf-core/configs#documentation).
144140
{% else %}
145141
{% endif %}
146142
Note that multiple profiles can be loaded, for example: `-profile test,docker` - the order of arguments is important!
@@ -185,13 +181,13 @@ Specify the path to a specific config file (this is a core Nextflow command). Se
185181

186182
### Resource requests
187183

188-
Whilst the default requirements set within the pipeline will hopefully work for most people and with most input data, you may find that you want to customise the compute resources that the pipeline requests. Each step in the pipeline has a default set of requirements for number of CPUs, memory and time. For most of the steps in the pipeline, if the job exits with any of the error codes specified [here](https://github.com/nf-core/rnaseq/blob/4c27ef5610c87db00c3c5a3eed10b1d161abf575/conf/base.config#L18) it will automatically be resubmitted with higher requests (2 x original, then 3 x original). If it still fails after the third attempt then the pipeline execution is stopped.
184+
Whilst the default requirements set within the pipeline will hopefully work for most people and with most input data, you may find that you want to customise the compute resources that the pipeline requests. Each step in the pipeline has a default set of requirements for number of CPUs, memory and time. For most of the pipeline steps, if the job exits with any of the error codes specified [here](https://github.com/nf-core/rnaseq/blob/4c27ef5610c87db00c3c5a3eed10b1d161abf575/conf/base.config#L18) it will automatically be resubmitted with higher resources request (2 x original, then 3 x original). If it still fails after the third attempt then the pipeline execution is stopped.
189185

190186
To change the resource requests, please see the [max resources](https://nf-co.re/docs/usage/configuration#max-resources) and [tuning workflow resources](https://nf-co.re/docs/usage/configuration#tuning-workflow-resources) section of the nf-core website.
191187

192188
### Custom Containers
193189

194-
In some cases you may wish to change which container or conda environment a step of the pipeline uses for a particular tool. By default nf-core pipelines use containers and software from the [biocontainers](https://biocontainers.pro/) or [bioconda](https://bioconda.github.io/) projects. However in some cases the pipeline specified version maybe out of date.
190+
In some cases, you may wish to change the container or conda environment used by a pipeline steps for a particular tool. By default, nf-core pipelines use containers and software from the [biocontainers](https://biocontainers.pro/) or [bioconda](https://bioconda.github.io/) projects. However, in some cases the pipeline specified version maybe out of date.
195191

196192
To use a different container from the default container or conda environment specified in a pipeline, please see the [updating tool versions](https://nf-co.re/docs/usage/configuration#updating-tool-versions) section of the nf-core website.
197193

0 commit comments

Comments
 (0)