Skip to content

Commit fc3f4bd

Browse files
authored
Merge pull request #199 from assemblerflow/dev
Update - version 1.4.1
2 parents 38a0fbf + a797482 commit fc3f4bd

Some content is hidden

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

48 files changed

+601
-126
lines changed

changelog.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,39 @@
22

33
## Changes in upcoming release (`dev` branch)
44

5+
6+
## 1.4.0
7+
8+
### New features
9+
10+
- Added support for the report system to:
11+
- `maxbin2`
12+
- Added new `manifest.config` with the pipeline metadata
13+
14+
### New components
15+
16+
- `Kraken2`: Taxonomic identification on FastQ files
17+
18+
### Bug fixes
19+
20+
- Fix bug in `momps`component related to added in the introduction of the clear input parameter
21+
- Fixed bug with the `-ft` parameters not retrieving the dockerhub tags for
22+
all the components.
23+
- Fixed bug in the `megahit` process where the fastg mode would break the process
24+
- Fix inspect and report mode to fetch the nextflow file independently of its
25+
position in the `nextflow run` command inside the .nextflow.log file.
26+
- Fix parsing of .nextflow.log file when searching for `nextflow run` command.
27+
- Fixed bug between mash_sketch_fasta and mash_dist.
28+
29+
### Minor/Other changes
30+
31+
- Added option to `dengue_typing` to retrieve closest reference sequence and link it
32+
with a secondary channel into `mafft`
33+
- New version of DEN-IM recipe
34+
- Now prints an ordered list of components
35+
- Moved taxonomy results from `results/annotation/` to `results/taxonomy/`
36+
37+
538
## 1.4.0
639

740
### New features
@@ -41,9 +74,11 @@ resolution
4174
- Added seed parameter to `downsample_fastq` component.
4275
- Added bacmet database to `abricate` component.
4376
- Added default docker option to avoid docker permission errors.
77+
- Changed the default URL generated by inspect and report commands.
4478
- Changed the default URL generated by inspect and report commands.
4579
- Added directives to `-L` parameter of build module.
4680

81+
4782
### Bug fixes
4883

4984
- Fixed forks with same source process name.

docs/resources/reports/binning.png

19 KB
Loading

docs/user/available_components.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@ Taxonomic Profiling
135135
- :doc:`components/kraken`: Performs taxonomic identification with kraken on FastQ files
136136
(minikrakenDB2017 as default database)
137137

138+
- :doc:`components/kraken2`: Performs taxonomic identification with kraken2 on FastQ files
139+
(minikraken2_v1_8GB as default database)
140+
138141
- :doc:`components/midas_species`: Performs taxonomic identification on FastQ files at the
139142
species level with midas (requires database)
140143

docs/user/components/kraken.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Parameters
2727
Published results
2828
-----------------
2929

30-
- ``results/annotation/kraken``: Stores the results of the screening
30+
- ``results/taxonomy/kraken``: Stores the results of the screening
3131
for each sample.
3232

3333
Published reports

docs/user/components/kraken2.rst

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
kraken2
2+
=======
3+
4+
Purpose
5+
-------
6+
7+
This component performs Kraken2 to assign taxonomic labels to short DNA
8+
sequences, usually obtained through metagenomic studies.
9+
10+
.. note::
11+
Software page: https://ccb.jhu.edu/software/kraken2/
12+
13+
Input/Output type
14+
------------------
15+
16+
- Input type: ``FastQ``
17+
- Output type: txt
18+
19+
.. note::
20+
The default input parameter for fastq data is ``--fastq``.
21+
22+
Parameters
23+
----------
24+
25+
- ``kraken2DB``: Specifies kraken2 database. Default: minikraken2_v1_8GB (in path inside the
26+
default container)
27+
28+
Published results
29+
-----------------
30+
31+
- ``results/taxonomy/kraken2``: Stores the results of the screening
32+
for each sample.
33+
34+
Published reports
35+
-----------------
36+
37+
None.
38+
39+
Default directives
40+
------------------
41+
42+
- ``container``: flowcraft/kraken2
43+
- ``version``: 2.0.7-1
44+
- ``cpus``: 3
45+
- ``memory``: 5GB (dynamically increased on retry)

docs/user/components/maxbin2.rst

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,11 @@ Default directives
4545

4646
- ``container``: flowcraft/maxbin2
4747
- ``version``: 2.2.4-1
48-
- ``cpus``: 3
49-
- ``memory``: 5.GB * task.attempt
48+
- ``cpus``: 4
49+
- ``memory``: 8.GB (dynamically increased on retry)
50+
51+
52+
Template
53+
^^^^^^^^
54+
55+
:mod:`assemblerflow.templates.maxbin2`

docs/user/components/megahit.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ Parameters
2727
from the maximum read length of each assembly. If 'default', megahit will
2828
use the default k-mer lengths.
2929

30+
- ``fastg``: When true, it converts megahit intermediate contigs into fastg.
31+
Default: False
32+
33+
34+
3035
Published results
3136
-----------------
3237

docs/user/components/midas_species.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Parameters
2727
Published results
2828
-----------------
2929

30-
- ``results/annotation/midas``: Stores the results of the screening
30+
- ``results/taxonomy/midas``: Stores the results of the screening
3131
for each sample.
3232

3333
Published reports

docs/user/pipeline_building.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ determine the raw input type, and the parameter for providing input data.
1414
The input type information is provided in the documentation page of each
1515
component. For instance, if the first component is FastQC, which has an input
1616
type of ``FastQ``, the parameter for providing the raw input data will be
17-
``--fasta``. Here are the currently supported input types and their
17+
``--fastq``. Here are the currently supported input types and their
1818
respective parameters:
1919

2020
- ``FastQ``: ``--fastq``

docs/user/reports/maxbin2.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
maxbin2
2+
----
3+
4+
Table data
5+
^^^^^^^^^^
6+
7+
Metagenomic Binning (sample specific):
8+
- **Bin name**: The number of bin.
9+
- **Completness**: Estimation of completion of genome in bin (% of Single copy genes present)
10+
- **Genome size**: Total size of the bin
11+
- **GC content**: Percentage of GC in the bin
12+
13+
.. image:: ../resources/reports/binning.png
14+
:scale: 80 %
15+
:align: center

0 commit comments

Comments
 (0)