Skip to content

Commit 3b4dd34

Browse files
authored
2.2.0 release
Prepare release 2.2.0
2 parents e065754 + 1867f34 commit 3b4dd34

File tree

164 files changed

+5560
-3037
lines changed

Some content is hidden

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

164 files changed

+5560
-3037
lines changed

.editorconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@ trim_trailing_whitespace = true
88
indent_size = 4
99
indent_style = space
1010

11-
[*.{yml,yaml}]
11+
[*.{md,yml,yaml,html,css,scss,js}]
1212
indent_size = 2
1313

14-
[*.json]
15-
insert_final_newline = unset
16-
1714
# These files are edited and tested upstream in nf-core/modules
1815
[/modules/nf-core/**]
1916
charset = unset

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
*.config linguist-language=nextflow
2+
modules/nf-core/** linguist-generated
3+
subworkflows/nf-core/** linguist-generated

.github/CONTRIBUTING.md

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ Contributions to the code are even more welcome ;)
1515

1616
If you'd like to write some code for nf-core/mag, the standard workflow is as follows:
1717

18-
1. Check that there isn't already an issue about your idea in the [nf-core/mag issues](https://github.com/nf-core/mag/issues) to avoid duplicating work
19-
* If there isn't one already, please create one so that others know you're working on this
18+
1. Check that there isn't already an issue about your idea in the [nf-core/mag issues](https://github.com/nf-core/mag/issues) to avoid duplicating work. If there isn't one already, please create one so that others know you're working on this
2019
2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [nf-core/mag repository](https://github.com/nf-core/mag) to your GitHub account
2120
3. Make the necessary changes / additions within your forked repository following [Pipeline conventions](#pipeline-contribution-conventions)
2221
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).
@@ -49,9 +48,9 @@ These tests are run both with the latest available version of `Nextflow` and als
4948

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

52-
* On your own fork, make a new branch `patch` based on `upstream/master`.
53-
* Fix the bug, and bump version (X.Y.Z+1).
54-
* A PR should be made on `master` from patch to directly this particular bug.
51+
- On your own fork, make a new branch `patch` based on `upstream/master`.
52+
- 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.
5554

5655
## Getting help
5756

@@ -68,16 +67,13 @@ If you wish to contribute a new step, please use the following coding standards:
6867
1. Define the corresponding input channel into your new process from the expected previous process channel
6968
2. Write the process block (see below).
7069
3. Define the output channel if needed (see below).
71-
4. Add any new flags/options to `nextflow.config` with a default (see below).
72-
5. Add any new flags/options to `nextflow_schema.json` with help text (with `nf-core schema build`).
73-
6. Add any new flags/options to the help message (for integer/text parameters, print to help the corresponding `nextflow.config` parameter).
74-
7. Add sanity checks for all relevant parameters.
75-
8. Add any new software to the `scrape_software_versions.py` script in `bin/` and the version command to the `scrape_software_versions` process in `main.nf`.
76-
9. Do local tests that the new code works properly and as expected.
77-
10. Add a new test command in `.github/workflow/ci.yml`.
78-
11. If applicable add a [MultiQC](https://https://multiqc.info/) module.
79-
12. Update MultiQC config `assets/multiqc_config.yaml` so relevant suffixes, name clean up, General Statistics Table column order, and module figures are in the right order.
80-
13. Optional: Add any descriptions of MultiQC report sections and output files to `docs/output.md`.
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).
72+
6. Add sanity checks and validation for all relevant parameters.
73+
7. Perform local tests to validate that the new code works as expected.
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`.
8177

8278
### Default values
8379

@@ -95,34 +91,13 @@ The process resources can be passed on to the tool dynamically within the proces
9591

9692
Please use the following naming schemes, to make it easy to understand what is going where.
9793

98-
* initial process channel: `ch_output_from_<process>`
99-
* intermediate and terminal channels: `ch_<previousprocess>_for_<nextprocess>`
94+
- initial process channel: `ch_output_from_<process>`
95+
- intermediate and terminal channels: `ch_<previousprocess>_for_<nextprocess>`
10096

10197
### Nextflow version bumping
10298

10399
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]`
104100

105-
### Software version reporting
106-
107-
If you add a new tool to the pipeline, please ensure you add the information of the tool to the `get_software_version` process.
108-
109-
Add to the script block of the process, something like the following:
110-
111-
```bash
112-
<YOUR_TOOL> --version &> v_<YOUR_TOOL>.txt 2>&1 || true
113-
```
114-
115-
or
116-
117-
```bash
118-
<YOUR_TOOL> --help | head -n 1 &> v_<YOUR_TOOL>.txt 2>&1 || true
119-
```
120-
121-
You then need to edit the script `bin/scrape_software_versions.py` to:
122-
123-
1. Add a Python regex for your tool's `--version` output (as in stored in the `v_<YOUR_TOOL>.txt` file), to ensure the version is reported as a `v` and the version number e.g. `v2.1.1`
124-
2. Add a HTML entry to the `OrderedDict` for formatting in MultiQC.
125-
126101
### Images and figures
127102

128103
For overview images and other documents we follow the nf-core [style guidelines and examples](https://nf-co.re/developers/design_guidelines).

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 63 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Bug report
2+
description: Report something that is broken or incorrect
3+
labels: bug
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Before you post this issue, please check the documentation:
9+
10+
- [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting)
11+
- [nf-core/mag pipeline documentation](https://nf-co.re/mag/usage)
12+
13+
- type: textarea
14+
id: description
15+
attributes:
16+
label: Description of the bug
17+
description: A clear and concise description of what the bug is.
18+
validations:
19+
required: true
20+
21+
- type: textarea
22+
id: command_used
23+
attributes:
24+
label: Command used and terminal output
25+
description: Steps to reproduce the behaviour. Please paste the command you used to launch the pipeline and the output from your terminal.
26+
render: console
27+
placeholder: |
28+
$ nextflow run ...
29+
30+
Some output where something broke
31+
32+
- type: textarea
33+
id: files
34+
attributes:
35+
label: Relevant files
36+
description: |
37+
Please drag and drop the relevant files here. Create a `.zip` archive if the extension is not allowed.
38+
Your verbose log file `.nextflow.log` is often useful _(this is a hidden file in the directory where you launched the pipeline)_ as well as custom Nextflow configuration files.
39+
40+
- type: textarea
41+
id: system
42+
attributes:
43+
label: System information
44+
description: |
45+
* Nextflow version _(eg. 21.10.3)_
46+
* Hardware _(eg. HPC, Desktop, Cloud)_
47+
* Executor _(eg. slurm, local, awsbatch)_
48+
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter or Charliecloud)_
49+
* OS _(eg. CentOS Linux, macOS, Linux Mint)_
50+
* Version of nf-core/mag _(eg. 1.1, 1.5, 1.8.2)_

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
blank_issues_enabled: false
21
contact_links:
32
- name: Join nf-core
43
url: https://nf-co.re/join

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Feature request
2+
description: Suggest an idea for the nf-core/mag pipeline
3+
labels: enhancement
4+
body:
5+
- type: textarea
6+
id: description
7+
attributes:
8+
label: Description of feature
9+
description: Please describe your suggestion for a new feature. It might help to describe a problem or use case, plus any alternatives that you have considered.
10+
validations:
11+
required: true

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@ Remember that PRs should be made against the dev branch, unless you're preparing
1010
1111
Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/mag/tree/master/.github/CONTRIBUTING.md)
1212
-->
13-
<!-- markdownlint-disable ul-indent -->
1413

1514
## PR checklist
1615

1716
- [ ] This comment contains a description of changes (with reason).
1817
- [ ] If you've fixed a bug or added code that should be tested, add tests!
19-
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/mag/tree/master/.github/CONTRIBUTING.md)
20-
- [ ] If necessary, also make a PR on the nf-core/mag _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/mag/tree/master/.github/CONTRIBUTING.md)
19+
- [ ] If necessary, also make a PR on the nf-core/mag _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
2120
- [ ] Make sure your code lints (`nf-core lint`).
22-
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker`).
21+
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
2322
- [ ] Usage Documentation in `docs/usage.md` is updated.
2423
- [ ] Output Documentation in `docs/output.md` is updated.
2524
- [ ] `CHANGELOG.md` is updated.

.github/workflows/awsfulltest.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,14 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Launch workflow via tower
17-
uses: nf-core/tower-action@master
18-
17+
uses: nf-core/tower-action@v3
1918
with:
2019
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
21-
bearer_token: ${{ secrets.TOWER_BEARER_TOKEN }}
20+
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
2221
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
23-
pipeline: ${{ github.repository }}
24-
revision: ${{ github.sha }}
2522
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/mag/work-${{ github.sha }}
2623
parameters: |
2724
{
2825
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/mag/results-${{ github.sha }}"
2926
}
30-
profiles: '[ "test_full", "aws_tower" ]'
27+
profiles: test_full,aws_tower

0 commit comments

Comments
 (0)