Skip to content

Commit a63ab11

Browse files
authored
Merge pull request #103 from Joon-Klaps/61-update-docs-make-release
61 update docs make release
2 parents c5d5510 + 3dc8c1b commit a63ab11

27 files changed

+2262
-223
lines changed

.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@
3333
}
3434
},
3535

36-
"postCreateCommand": "pre-commit install --install-hooks && nextflow self-update"
36+
"postCreateCommand": "pre-commit install --install-hooks && nextflow self-update && pip install mkdocs-material"
3737
}

.github/workflows/build-docs.yml

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Publish Docs On Change
2+
on:
3+
push:
4+
branches:
5+
- main
6+
- dev
7+
- master
8+
9+
permissions:
10+
contents: write
11+
12+
jobs:
13+
build:
14+
name: Deploy docs
15+
runs-on: ubuntu-latest
16+
if: github.event.repository.fork == false
17+
defaults:
18+
run:
19+
shell: bash -x -l {0}
20+
steps:
21+
- uses: actions/checkout@v4
22+
with:
23+
fetch-depth: 0 # fetch all commits/branches
24+
- name: Configure Git Credentials
25+
run: |
26+
git config user.name github-actions[bot]
27+
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
28+
- uses: actions/setup-python@v5
29+
with:
30+
python-version: 3.x
31+
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
32+
- uses: actions/cache@v4
33+
with:
34+
key: mkdocs-material-${{ env.cache_id }}
35+
path: .cache
36+
restore-keys: |
37+
mkdocs-material-
38+
- run: apt-get install pngquant
39+
- name: Install dependencies
40+
run: pip install mkdocs-material pymdown-extensions pillow cairosvg mike
41+
- name: Build docs
42+
run: mike deploy --push --update-aliases ${{ env.plugin_version }} latest
43+
- name: Set default docs
44+
run: mike set-default --push latest

.gitpod.yml

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ tasks:
77
- name: unset JAVA_TOOL_OPTIONS
88
command: |
99
unset JAVA_TOOL_OPTIONS
10+
- name: Setup mkdocs-material
11+
command: |
12+
pip install mkdocs-material
1013
1114
vscode:
1215
extensions: # based on nf-core.nf-core-extensionpack

.nf-core.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ lint:
66
- docs/README.md
77
- .github/ISSUE_TEMPLATE/bug_report.yml
88
- .github/ISSUE_TEMPLATE/config.yml
9-
- .github/CONTRIBUTING.md
109
- .github/ISSUE_TEMPLATE/feature_request.yml
1110
- .github/PULL_REQUEST_TEMPLATE.md
1211
- .github/workflows/branch.yml
@@ -27,6 +26,8 @@ lint:
2726
- report_section_order
2827
- report_comment
2928
files_exist:
29+
- .github/CONTRIBUTING.md
30+
- CITATIONS.md
3031
- conf/test.config
3132
- conf/test_full.config
3233
- lib/Utils.groovy

.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ testing/
1010
testing*
1111
*.pyc
1212
bin/
13+
*.md

README.md

+35-27
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
## Pipeline summary
2525

26-
![viral-genie-workflow](docs/images/workflow.png)
26+
![viral-genie-workflow](images/metromap_style_pipeline_workflow_viralgenie.png)
2727

2828
Tools given for each step can change as benchmarking is in progress.
2929

@@ -36,58 +36,66 @@ Tools given for each step can change as benchmarking is in progress.
3636
- Performs taxonomic classification and/or profiling using one or more of:
3737
- [`Kraken2`](https://ccb.jhu.edu/software/kraken2/)
3838
- [`Kaiju`](https://kaiju.binf.ku.dk/)
39-
- Perform optional post-processing ([`bracken`](https://ccb.jhu.edu/software/bracken/))
40-
- Plotting Kraken2, Centrifuge, Kaiju and MALT results ([`Krona`](https://hpc.nih.gov/apps/kronatools.html))
39+
- Plotting Kraken2 and Kaiju ([`Krona`](https://hpc.nih.gov/apps/kronatools.html))
4140
4. Denovo assembly ([`SPAdes`](http://cab.spbu.ru/software/spades/), [`TRINITY`](https://github.com/trinityrnaseq/trinityrnaseq), [`megahit`](https://github.com/voutcn/megahit)), combine contigs.
42-
5. Contig cluster annotation & binning ([`blastn`](https://blast.ncbi.nlm.nih.gov/Blast.cgi?PAGE_TYPE=BlastSearch))
43-
44-
- Identify top 5 blast hits
45-
- Merge blast hit seqs and contigs into a single file & cluster ([`cdhit`](https://sites.google.com/view/cd-hit), [`vsearch`](https://github.com/torognes/vsearch/wiki/Clustering))
46-
- Filter for only contigs that correspond to the identified centroid
47-
48-
6. Scaffolding of contigs ([`MAFFT`](https://mafft.cbrc.jp/alignment/server/), [`MUSCLE`](https://www.drive5.com/muscle/))
49-
7. Creation of hybrid supercontig by combining contigs and the reference.
50-
8. Mapping filtered reads to hybrid supercontig ([`BowTie2`](http://bowtie-bio.sourceforge.net/bowtie2/),[`BWAmem2`](https://github.com/bwa-mem2/bwa-mem2))
51-
9. Update consensus genome with mapped reads ([`BCFTools`](http://samtools.github.io/bcftools/bcftools.html),[`iVar`](https://andersen-lab.github.io/ivar/html/manualpage.html))
52-
10. Repeat step 8-9 multiple times
53-
11. Variant calling and annotation ([`BCFTools`](http://samtools.github.io/bcftools/bcftools.html),[`iVar`](https://andersen-lab.github.io/ivar/html/manualpage.html))
54-
12. Assembly & contig evaluation ([`QUAST`](http://quast.sourceforge.net/quast),[`CheckV`](https://bitbucket.org/berkeleylab/checkv/src/master/),[`blastn`](https://blast.ncbi.nlm.nih.gov/Blast.cgi))
55-
13. Present QC and visualisation for raw read, alignment, assembly and variant calling results ([`MultiQC`](http://multiqc.info/))
41+
5. Contig reference idententification ([`blastn`](https://blast.ncbi.nlm.nih.gov/Blast.cgi?PAGE_TYPE=BlastSearch))
42+
- Identify top 5 blast hits
43+
- Merge blast hit and all contigs of a sample
44+
6. [Optional] Precluster contigs based on taxonomy
45+
- Identify taxonomy [`Kraken2`](https://ccb.jhu.edu/software/kraken2/) and [`Kaiju`](https://kaiju.binf.ku.dk/)
46+
- Resolve potential incosistencies in taxonomy [`Kaiju-mergeOutputs`](https://kaiju.binf.ku.dk/)
47+
7. Cluster contigs (or every taxonomic bin) of samples, options are:
48+
- [`cdhitest`](https://sites.google.com/view/cd-hit)
49+
- [`vsearch`](https://github.com/torognes/vsearch/wiki/Clustering)
50+
- [`mmseqs-linclust`](https://github.com/soedinglab/MMseqs2/wiki#linear-time-clustering-using-mmseqs-linclust)
51+
- [`mmseqs-cluster`](https://github.com/soedinglab/MMseqs2/wiki#cascaded-clustering)
52+
- [`vRhyme`](https://github.com/AnantharamanLab/vRhyme)
53+
- [`mash`](https://github.com/marbl/Mash)
54+
8. Scaffolding of contigs to centroid ([`Minimap2`](https://github.com/lh3/minimap2), [`iVar-consensus`](https://andersen-lab.github.io/ivar/html/manualpage.html))
55+
9. [Optional] Annotate 0-depth regions with external reference `custom-script`.
56+
10. Mapping filtered reads to supercontig and mapping constrains([`BowTie2`](http://bowtie-bio.sourceforge.net/bowtie2/),[`BWAmem2`](https://github.com/bwa-mem2/bwa-mem2) and [`BWA`](https://github.com/lh3/bwa))
57+
11. [Optional] Deduplicate reads ([`Picard`](https://broadinstitute.github.io/picard/) or if UMI's are used [`UMI-tools`](https://umi-tools.readthedocs.io/en/latest/QUICK_START.html))
58+
12. Variant calling and filtering ([`BCFTools`](http://samtools.github.io/bcftools/bcftools.html),[`iVar`](https://andersen-lab.github.io/ivar/html/manualpage.html))
59+
13. Create consensus genome ([`BCFTools`](http://samtools.github.io/bcftools/bcftools.html),[`iVar`](https://andersen-lab.github.io/ivar/html/manualpage.html))
60+
14. Repeat step 10-13 multiple times for the denovo contig route
61+
15. Contig evaluation and annotation ([`QUAST`](http://quast.sourceforge.net/quast),[`CheckV`](https://bitbucket.org/berkeleylab/checkv/src/master/),[`blastn`](https://blast.ncbi.nlm.nih.gov/Blast.cgi), [`mmseqs-search`](https://github.com/soedinglab/MMseqs2/wiki#batch-sequence-searching-using-mmseqs-search))
62+
16. Present QC and visualisation for raw read, alignment, assembly, variant calling and consensus calling results ([`MultiQC`](http://multiqc.info/))
5663

5764
## Usage
5865

59-
> [!NOTE]
60-
> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how to set-up Nextflow. Make sure to [test your setup](https://nf-co.re/docs/usage/introduction#how-to-run-a-pipeline) with `-profile test` before running the workflow on actual data.
66+
!!! Note
67+
If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how to set-up Nextflow. Make sure to [test your setup](https://nf-co.re/docs/usage/introduction#how-to-run-a-pipeline) with `-profile test` before running the workflow on actual data.
6168

6269
Now, you can run the pipeline using:
6370

6471
```bash
65-
nextflow run viralgenie/main.nf \
72+
nextflow run Joon-Klaps/viralgenie \
6673
-profile <docker/singularity/.../institute> \
6774
--input samplesheet.csv \
6875
--outdir <OUTDIR>
6976
```
7077

71-
> [!WARNING]
72-
> Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_;
73-
> see [docs](https://nf-co.re/usage/configuration#custom-configuration-files).
78+
!!! Warning
79+
Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_;
80+
see [docs](https://nf-co.re/usage/configuration#custom-configuration-files).
7481

75-
For more details and further functionality, please refer to the [usage documentation](https://nf-co.re/viralgenie/usage) and the [parameter documentation](https://nf-co.re/viralgenie/parameters).
82+
For more details and further functionality, please refer to the [usage documentation](https://github.io/Joon-klaps/viralgenie/usage) and the [parameter documentation](https://github.io/Joon-klaps/viralgenie/parameters).
7683

7784
## Credits
7885

79-
viralgenie was originally written by joon.klaps@kuleuven.be.
86+
Viralgenie was originally written by [`Joon-Klaps`](https://github.com/Joon-Klaps).
8087

8188
We thank the following people for their extensive assistance in the development of this pipeline:
8289

8390
- [`Philippe Lemey`](https://github.com/plemey)
8491
- [`Liana Kafetzopoulou`](https://github.com/LianaKafetzopoulou)
92+
- [`nf-core community`](https://nf-co.re/)
8593

8694
<!-- TODO nf-core: If applicable, make list of people who have also contributed -->
8795

8896
## Contributions and Support
8997

90-
If you would like to contribute to this pipeline, please see the [contributing guidelines](.github/CONTRIBUTING.md).
98+
If you would like to contribute to this pipeline, please see the [contributing guidelines](https://github.io/Joon-klaps/viralgenie/CONTRIBUTING).
9199

92100
<!--
93101
For further information or help, don't hesitate to get in touch on the [Slack `#viralgenie` channel](https://nfcore.slack.com/channels/viralgenie) (you can join with [this invite](https://nf-co.re/join/slack)).
@@ -101,7 +109,7 @@ For further information or help, don't hesitate to get in touch on the [Slack `#
101109

102110
<!-- TODO nf-core: Add bibliography of tools and data used in your pipeline -->
103111

104-
An extensive list of references for the tools used by the pipeline can be found in the [`CITATIONS.md`](CITATIONS.md) file.
112+
An extensive list of references for the tools used by the pipeline can be found in the [`CITATIONS.md`](https://github.io/Joon-klaps/viralgenie/CITATIONS) file.
105113

106114
You can cite the `nf-core` publication as follows:
107115

-29 MB
Binary file not shown.

CITATIONS.md docs/CITATIONS.md

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
77
## [Nextflow](https://pubmed.ncbi.nlm.nih.gov/28398311/)
88

9-
<!-- TODO: Complete the lists of tools -->
10-
119
> Di Tommaso P, Chatzou M, Floden EW, Barja PP, Palumbo E, Notredame C. Nextflow enables reproducible computational workflows. Nat Biotechnol. 2017 Apr 11;35(4):316-319. doi: 10.1038/nbt.3820. PubMed PMID: 28398311.
1210
1311
## Pipeline tools

.github/CONTRIBUTING.md docs/CONTRIBUTING.md

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1-
# nf-core/viralgenie: Contributing Guidelines
1+
# Joon-Klaps/viralgenie: Contributing Guidelines
22

33
Hi there!
4-
Many thanks for taking an interest in improving nf-core/viralgenie.
54

6-
We try to manage the required tasks for nf-core/viralgenie using GitHub issues, you probably came to this page when creating one.
5+
__🤩 Many thanks for taking an interest in improving Viralgenie. 🤩__
6+
7+
We try to manage the required tasks for Viralgenie using GitHub issues, you probably came to this page when creating one.
78
Please use the pre-filled template to save time.
89

910
However, don't be put off by this template - other more general issues and suggestions are welcome!
1011
Contributions to the code are even more welcome ;
1112

12-
:::info
13-
If you need help using or modifying viralgenie then the best place to ask is on the nf-core Slack [Joon-Klaps](https://nfcore.slack.com/team/U043Y6FQR6J).
14-
:::
13+
!!! info
14+
If you need help using or modifying viralgenie then the best place to ask is on the nf-core Slack [Joon-Klaps](https://nfcore.slack.com/team/U043Y6FQR6J).
15+
1516

1617
## Contribution workflow
1718

18-
If you'd like to write some code for nf-core/viralgenie, the standard workflow is as follows:
19+
If you'd like to write some code for Joon-Klaps/viralgenie, the standard workflow is as follows:
1920

20-
1. Check that there isn't already an issue about your idea in the [nf-core/viralgenie issues](https://github.com/nf-core/viralgenie/issues) to avoid duplicating work. If there isn't one already, please create one so that others know you're working on this
21-
2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [nf-core/viralgenie repository](https://github.com/nf-core/viralgenie) to your GitHub account
21+
1. Check that there isn't already an issue about your idea in the [Joon-Klaps/viralgenie issues](https://github.com/Joon-Klaps/viralgenie/issues) to avoid duplicating work. If there isn't one already, please create one so that others know you're working on this
22+
2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [Joon-Klaps/viralgenie repository](https://github.com/Joon-Klaps/viralgenie) to your GitHub account
2223
3. Make the necessary changes / additions within your forked repository following [Pipeline conventions](#pipeline-contribution-conventions)
2324
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).
2425
5. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged
@@ -37,33 +38,32 @@ There are typically two types of tests that run:
3738

3839
### Lint tests
3940

40-
`nf-core` has a [set of guidelines](https://nf-co.re/developers/guidelines) which all pipelines must adhere to.
41-
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.
41+
`nf-core` has a [set of guidelines](https://nf-co.re/developers/guidelines) which viralgenie adheres to.
42+
To enforce these and ensure that viralgenie stays 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.
4243

4344
If any failures or warnings are encountered, please follow the listed URL for more documentation.
4445

4546
### Pipeline tests
4647

47-
Each `nf-core` pipeline should be set up with a minimal set of test-data.
48+
Viralgenie is set up with a minimal set of test-data.
4849
`GitHub Actions` then runs the pipeline on this data to ensure that it exits successfully.
4950
If there are any failures then the automated tests fail.
5051
These tests are run both with the latest available version of `Nextflow` and also the minimum required version that is stated in the pipeline code.
5152

5253
## Patch
5354

54-
:warning: Only in the unlikely and regretful event of a release happening with a bug.
55-
56-
- On your own fork, make a new branch `patch` based on `upstream/master`.
57-
- Fix the bug, and bump version (X.Y.Z+1).
58-
- A PR should be made on `master` from patch to directly this particular bug.
55+
!!! Warning "Only in the unlikely and regretful event of a release happening with a bug."
56+
- On your own fork, make a new branch `patch` based on `upstream/master`.
57+
- Fix the bug, and bump version (X.Y.Z+1).
58+
- A PR should be made on `master` from patch to directly this particular bug.
5959

6060
## Getting help
6161

62-
For further information/help, please consult the [nf-core/viralgenie documentation](https://nf-co.re/viralgenie/usage) and don't hesitate to get in touch on the nf-core Slack [#viralgenie](https://nfcore.slack.com/channels/viralgenie) channel ([join our Slack here](https://nf-co.re/join/slack)).
62+
For further information/help, please consult the [Joon-Klaps/viralgenie documentation](https://github.io/Joon-Klaps/viralgenie) and don't hesitate to get in touch on Slack [Joon-Klaps](https://nfcore.slack.com/team/U043Y6FQR6J) channel ([join the nf-core Slack here](https://nf-co.re/join/slack)).
6363

6464
## Pipeline contribution conventions
6565

66-
To make the nf-core/viralgenie 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.
66+
To make the Joon-Klaps/viralgenie 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.
6767

6868
### Adding a new step
6969

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

114114
To get started:
115115

116-
- Open the repo in [Codespaces](https://github.com/nf-core/viralgenie/codespaces)
116+
- Open the repo in [Codespaces](https://github.com/Joon-Klaps/viralgenie/codespaces)
117117
- Tools installed
118118
- nf-core
119119
- Nextflow

docs/README.md

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1-
# Joon-Klaps/viralgenie: Documentation
1+
---
2+
title: Viralgenie
3+
description: A metagenomics analysis pipeline for eukaryotic viruses written in nextflow
4+
---
25

3-
The Joon-Klaps/viralgenie documentation is split into the following pages:
6+
# ![viralgenie](images/nf-core-viralgenie_logo_dark.png#only-dark)
7+
# ![viralgenie](images/nf-core-viralgenie_logo_light.png#only-light)
48

5-
- [Usage](usage.md)
6-
- An overview of how the pipeline works, how to run it and a description of all of the different command-line flags.
7-
- [Output](output.md)
8-
- An overview of the different results produced by the pipeline and how to interpret them.
9+
{==
10+
11+
**A metagenomic analysis pipeline for eukaryotic viruses written in nextflow.**
12+
13+
==}
14+
15+
--8<-- "README.md:6:"

docs/customisation/configuration.md

Whitespace-only changes.

0 commit comments

Comments
 (0)