Skip to content

Commit e4bb266

Browse files
committed
Template update for nf-core/tools version 2.3.1
1 parent 06e1c81 commit e4bb266

33 files changed

+361
-382
lines changed

.editorconfig

+1-4
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

.github/CONTRIBUTING.md

+7-8
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/rnavar, the standard workflow is as follows:
1717

18-
1. Check that there isn't already an issue about your idea in the [nf-core/rnavar issues](https://github.com/nf-core/rnavar/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/rnavar issues](https://github.com/nf-core/rnavar/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/rnavar repository](https://github.com/nf-core/rnavar) 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

@@ -73,7 +72,7 @@ If you wish to contribute a new step, please use the following coding standards:
7372
6. Add sanity checks and validation for all relevant parameters.
7473
7. Perform local tests to validate that the new code works as expected.
7574
8. If applicable, add a new test command in `.github/workflow/ci.yml`.
76-
9. Update MultiQC config `assets/multiqc_config.yaml` 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.
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.
7776
10. Add a description of the output files and if relevant any appropriate images from the MultiQC report to `docs/output.md`.
7877

7978
### Default values
@@ -92,8 +91,8 @@ The process resources can be passed on to the tool dynamically within the proces
9291

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

95-
* initial process channel: `ch_output_from_<process>`
96-
* 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>`
9796

9897
### Nextflow version bumping
9998

.github/ISSUE_TEMPLATE/bug_report.yml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: Bug report
22
description: Report something that is broken or incorrect
33
labels: bug
44
body:
5-
65
- type: markdown
76
attributes:
87
value: |

.github/PULL_REQUEST_TEMPLATE.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/rnav
1616

1717
- [ ] This comment contains a description of changes (with reason).
1818
- [ ] 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/rnavar/tree/master/.github/CONTRIBUTING.md)
20-
- [ ] If necessary, also make a PR on the nf-core/rnavar _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
19+
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/rnavar/tree/master/.github/CONTRIBUTING.md)
20+
- [ ] If necessary, also make a PR on the nf-core/rnavar _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
2121
- [ ] Make sure your code lints (`nf-core lint`).
22-
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker` --outdir <OUTDIR>`).
22+
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
2323
- [ ] Usage Documentation in `docs/usage.md` is updated.
2424
- [ ] Output Documentation in `docs/output.md` is updated.
2525
- [ ] `CHANGELOG.md` is updated.

.github/workflows/awsfulltest.yml

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
# TODO nf-core: You can customise AWS full pipeline tests as required
1919
# Add full size test data (but still relatively small datasets for few samples)
2020
# on the `test_full.config` test runs with only one set of parameters
21-
2221
with:
2322
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
2423
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}

.github/workflows/awstest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
if: github.repository == 'nf-core/rnavar'
1111
runs-on: ubuntu-latest
1212
steps:
13+
# Launch workflow using Tower CLI tool action
1314
- name: Launch workflow via tower
1415
uses: nf-core/tower-action@v3
15-
1616
with:
1717
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
1818
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}

.github/workflows/branch.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ jobs:
1313
- name: Check PRs
1414
if: github.repository == 'nf-core/rnavar'
1515
run: |
16-
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/rnavar ]] && [[ $GITHUB_HEAD_REF = "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
17-
16+
"{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/rnavar ]] && [[ $GITHUB_HEAD_REF = "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]"
1817
1918
# If the above check failed, post a comment on the PR explaining the failure
2019
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
@@ -43,4 +42,4 @@ jobs:
4342
Thanks again for your contribution!
4443
repo-token: ${{ secrets.GITHUB_TOKEN }}
4544
allow-repeats: false
46-
45+
#

.github/workflows/ci.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ jobs:
1616
test:
1717
name: Run pipeline with test data
1818
# Only run on push if this is the nf-core dev branch (merged PRs)
19-
if: ${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/rnavar') }}
19+
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/rnavar') }}"
2020
runs-on: ubuntu-latest
2121
strategy:
2222
matrix:
2323
# Nextflow versions
2424
include:
2525
# Test pipeline minimum Nextflow version
26-
- NXF_VER: '21.10.3'
27-
NXF_EDGE: ''
26+
- NXF_VER: "21.10.3"
27+
NXF_EDGE: ""
2828
# Test latest edge release of Nextflow
29-
- NXF_VER: ''
30-
NXF_EDGE: '1'
29+
- NXF_VER: ""
30+
NXF_EDGE: "1"
3131
steps:
3232
- name: Check out pipeline code
3333
uses: actions/checkout@v2
@@ -48,3 +48,5 @@ jobs:
4848
# Remember that you can parallelise this by using strategy.matrix
4949
run: |
5050
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results
51+
52+
#

.github/workflows/linting.yml

+13-72
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,14 @@
11
name: nf-core linting
22
# This workflow is triggered on pushes and PRs to the repository.
3-
# It runs the `nf-core lint` and markdown lint tests to ensure that the code meets the nf-core guidelines
3+
# It runs the `nf-core lint` and markdown lint tests to ensure
4+
# that the code meets the nf-core guidelines.
45
on:
56
push:
67
pull_request:
78
release:
89
types: [published]
910

1011
jobs:
11-
Markdown:
12-
runs-on: ubuntu-latest
13-
steps:
14-
- uses: actions/checkout@v2
15-
- uses: actions/setup-node@v2
16-
- name: Install markdownlint
17-
run: npm install -g markdownlint-cli
18-
- name: Run Markdownlint
19-
run: markdownlint .
20-
21-
# If the above check failed, post a comment on the PR explaining the failure
22-
- name: Post PR comment
23-
if: failure()
24-
uses: mshick/add-pr-comment@v1
25-
with:
26-
message: |
27-
## Markdown linting is failing
28-
29-
To keep the code consistent with lots of contributors, we run automated code consistency checks.
30-
To fix this CI test, please run:
31-
32-
* Install `markdownlint-cli`
33-
* On Mac: `brew install markdownlint-cli`
34-
* Everything else: [Install `npm`](https://www.npmjs.com/get-npm) then [install `markdownlint-cli`](https://www.npmjs.com/package/markdownlint-cli) (`npm install -g markdownlint-cli`)
35-
* Fix the markdown errors
36-
* Automatically: `markdownlint . --fix`
37-
* Manually resolve anything left from `markdownlint .`
38-
39-
Once you push these changes the test should pass, and you can hide this comment :+1:
40-
41-
We highly recommend setting up markdownlint in your code editor so that this formatting is done automatically on save. Ask about it on Slack for help!
42-
43-
Thanks again for your contribution!
44-
repo-token: ${{ secrets.GITHUB_TOKEN }}
45-
allow-repeats: false
46-
4712
EditorConfig:
4813
runs-on: ubuntu-latest
4914
steps:
@@ -55,49 +20,24 @@ jobs:
5520
run: npm install -g editorconfig-checker
5621

5722
- name: Run ECLint check
58-
run: editorconfig-checker -exclude README.md $(git ls-files | grep -v test)
23+
run: editorconfig-checker -exclude README.md $(find .* -type f | grep -v '.git\|.py\|.md\|json\|yml\|yaml\|html\|css\|work\|.nextflow\|build\|nf_core.egg-info\|log.txt\|Makefile')
5924

60-
YAML:
25+
Prettier:
6126
runs-on: ubuntu-latest
6227
steps:
63-
- name: Checkout
64-
uses: actions/checkout@master
65-
- name: 'Yamllint'
66-
uses: karancode/yamllint-github-action@master
67-
with:
68-
yamllint_file_or_dir: '.'
69-
yamllint_config_filepath: '.yamllint.yml'
70-
71-
# If the above check failed, post a comment on the PR explaining the failure
72-
- name: Post PR comment
73-
if: failure()
74-
uses: mshick/add-pr-comment@v1
75-
with:
76-
message: |
77-
## YAML linting is failing
78-
79-
To keep the code consistent with lots of contributors, we run automated code consistency checks.
80-
To fix this CI test, please run:
81-
82-
* Install `yamllint`
83-
* Install `yamllint` following [this](https://yamllint.readthedocs.io/en/stable/quickstart.html#installing-yamllint)
84-
instructions or alternative install it in your [conda environment](https://anaconda.org/conda-forge/yamllint)
85-
* Fix the markdown errors
86-
* Run the test locally: `yamllint $(find . -type f -name "*.yml" -o -name "*.yaml") -c ./.yamllint.yml`
87-
* Fix any reported errors in your YAML files
28+
- uses: actions/checkout@v2
8829

89-
Once you push these changes the test should pass, and you can hide this comment :+1:
30+
- uses: actions/setup-node@v2
9031

91-
We highly recommend setting up yaml-lint in your code editor so that this formatting is done automatically on save. Ask about it on Slack for help!
32+
- name: Install Prettier
33+
run: npm install -g prettier
9234

93-
Thanks again for your contribution!
94-
repo-token: ${{ secrets.GITHUB_TOKEN }}
95-
allow-repeats: false
35+
- name: Run Prettier --check
36+
run: prettier --check ${GITHUB_WORKSPACE}
9637

9738
nf-core:
9839
runs-on: ubuntu-latest
9940
steps:
100-
10141
- name: Check out pipeline code
10242
uses: actions/checkout@v2
10343

@@ -110,8 +50,8 @@ jobs:
11050
11151
- uses: actions/setup-python@v1
11252
with:
113-
python-version: '3.6'
114-
architecture: 'x64'
53+
python-version: "3.6"
54+
architecture: "x64"
11555

11656
- name: Install dependencies
11757
run: |
@@ -139,3 +79,4 @@ jobs:
13979
lint_results.md
14080
PR_number.txt
14181
82+
#

.github/workflows/linting_comment.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
name: nf-core linting comment
32
# This workflow is triggered after the linting action is complete
43
# It posts an automated comment to the PR, even if the PR is coming from a fork
@@ -27,4 +26,4 @@ jobs:
2726
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2827
number: ${{ steps.pr_number.outputs.pr_number }}
2928
path: linting-logs/lint_results.md
30-
29+
#

.gitpod.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ image: nfcore/gitpod:latest
22

33
vscode:
44
extensions: # based on nf-core.nf-core-extensionpack
5-
- codezombiech.gitignore # Language support for .gitignore files
5+
- codezombiech.gitignore # Language support for .gitignore files
66
# - cssho.vscode-svgviewer # SVG viewer
7-
- davidanson.vscode-markdownlint # Markdown/CommonMark linting and style checking for Visual Studio Code
8-
- eamodio.gitlens # Quickly glimpse into whom, why, and when a line or code block was changed
9-
- EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files
10-
- Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar
11-
- mechatroner.rainbow-csv # Highlight columns in csv files in different colors
7+
- davidanson.vscode-markdownlint # Markdown/CommonMark linting and style checking for Visual Studio Code
8+
- eamodio.gitlens # Quickly glimpse into whom, why, and when a line or code block was changed
9+
- EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files
10+
- Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar
11+
- mechatroner.rainbow-csv # Highlight columns in csv files in different colors
1212
# - nextflow.nextflow # Nextflow syntax highlighting
13-
- oderwat.indent-rainbow # Highlight indentation level
14-
- streetsidesoftware.code-spell-checker # Spelling checker for source code
13+
- oderwat.indent-rainbow # Highlight indentation level
14+
- streetsidesoftware.code-spell-checker # Spelling checker for source code

.markdownlint.yml

-14
This file was deleted.

.prettierrc.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
printWidth: 120

.yamllint.yml

-6
This file was deleted.

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Initial release of nf-core/rnavar, created with the [nf-core](https://nf-co.re/)
1111

1212
### `Fixed`
1313

14+
- Clarified conda usage and added an installation tutorial for Singularity since the one on Syllabs' website uses an outdate version of GO Compiler
15+
1416
### `Dependencies`
1517

1618
### `Deprecated`

CITATIONS.md

+15-12
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,26 @@
1010
1111
## Pipeline tools
1212

13-
* [FastQC](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/)
13+
- [FastQC](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/)
1414

15-
* [MultiQC](https://pubmed.ncbi.nlm.nih.gov/27312411/)
16-
> Ewels P, Magnusson M, Lundin S, Käller M. MultiQC: summarize analysis results for multiple tools and samples in a single report. Bioinformatics. 2016 Oct 1;32(19):3047-8. doi: 10.1093/bioinformatics/btw354. Epub 2016 Jun 16. PubMed PMID: 27312411; PubMed Central PMCID: PMC5039924.
15+
- [MultiQC](https://pubmed.ncbi.nlm.nih.gov/27312411/)
16+
> Ewels P, Magnusson M, Lundin S, Käller M. MultiQC: summarize analysis results for multiple tools and samples in a single report. Bioinformatics. 2016 Oct 1;32(19):3047-8. doi: 10.1093/bioinformatics/btw354. Epub 2016 Jun 16. PubMed PMID: 27312411; PubMed Central PMCID: PMC5039924.
1717
1818
## Software packaging/containerisation tools
1919

20-
* [Anaconda](https://anaconda.com)
21-
> Anaconda Software Distribution. Computer software. Vers. 2-2.4.0. Anaconda, Nov. 2016. Web.
20+
- [Anaconda](https://anaconda.com)
2221

23-
* [Bioconda](https://pubmed.ncbi.nlm.nih.gov/29967506/)
24-
> Grüning B, Dale R, Sjödin A, Chapman BA, Rowe J, Tomkins-Tinch CH, Valieris R, Köster J; Bioconda Team. Bioconda: sustainable and comprehensive software distribution for the life sciences. Nat Methods. 2018 Jul;15(7):475-476. doi: 10.1038/s41592-018-0046-7. PubMed PMID: 29967506.
22+
> Anaconda Software Distribution. Computer software. Vers. 2-2.4.0. Anaconda, Nov. 2016. Web.
2523
26-
* [BioContainers](https://pubmed.ncbi.nlm.nih.gov/28379341/)
27-
> da Veiga Leprevost F, Grüning B, Aflitos SA, Röst HL, Uszkoreit J, Barsnes H, Vaudel M, Moreno P, Gatto L, Weber J, Bai M, Jimenez RC, Sachsenberg T, Pfeuffer J, Alvarez RV, Griss J, Nesvizhskii AI, Perez-Riverol Y. BioContainers: an open-source and community-driven framework for software standardization. Bioinformatics. 2017 Aug 15;33(16):2580-2582. doi: 10.1093/bioinformatics/btx192. PubMed PMID: 28379341; PubMed Central PMCID: PMC5870671.
24+
- [Bioconda](https://pubmed.ncbi.nlm.nih.gov/29967506/)
2825

29-
* [Docker](https://dl.acm.org/doi/10.5555/2600239.2600241)
26+
> Grüning B, Dale R, Sjödin A, Chapman BA, Rowe J, Tomkins-Tinch CH, Valieris R, Köster J; Bioconda Team. Bioconda: sustainable and comprehensive software distribution for the life sciences. Nat Methods. 2018 Jul;15(7):475-476. doi: 10.1038/s41592-018-0046-7. PubMed PMID: 29967506.
3027
31-
* [Singularity](https://pubmed.ncbi.nlm.nih.gov/28494014/)
32-
> Kurtzer GM, Sochat V, Bauer MW. Singularity: Scientific containers for mobility of compute. PLoS One. 2017 May 11;12(5):e0177459. doi: 10.1371/journal.pone.0177459. eCollection 2017. PubMed PMID: 28494014; PubMed Central PMCID: PMC5426675.
28+
- [BioContainers](https://pubmed.ncbi.nlm.nih.gov/28379341/)
29+
30+
> da Veiga Leprevost F, Grüning B, Aflitos SA, Röst HL, Uszkoreit J, Barsnes H, Vaudel M, Moreno P, Gatto L, Weber J, Bai M, Jimenez RC, Sachsenberg T, Pfeuffer J, Alvarez RV, Griss J, Nesvizhskii AI, Perez-Riverol Y. BioContainers: an open-source and community-driven framework for software standardization. Bioinformatics. 2017 Aug 15;33(16):2580-2582. doi: 10.1093/bioinformatics/btx192. PubMed PMID: 28379341; PubMed Central PMCID: PMC5870671.
31+
32+
- [Docker](https://dl.acm.org/doi/10.5555/2600239.2600241)
33+
34+
- [Singularity](https://pubmed.ncbi.nlm.nih.gov/28494014/)
35+
> Kurtzer GM, Sochat V, Bauer MW. Singularity: Scientific containers for mobility of compute. PLoS One. 2017 May 11;12(5):e0177459. doi: 10.1371/journal.pone.0177459. eCollection 2017. PubMed PMID: 28494014; PubMed Central PMCID: PMC5426675.

0 commit comments

Comments
 (0)