Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v1.0.1](https://github.com/nf-core/reportho/releases/tag/1.0.1) [2024-06-14]

### `Fixed`

- Fixed minor bugs that caused compilation errors in the structural alignment section
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any way to catch these kind of things with different parameter matrices in the CI tests?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely, I can create a test for that. However, that means quite a lot of extra computation at each CI run. What do you say?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be nice if we could move this forward to make available the output of the pipeline into the nf-core web

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay for me if the tests are actually too computationally expensive

- Restricted publishing of intermediate files

## [v1.0.0](https://github.com/nf-core/reportho/releases/tag/1.0.0) - Magnificent Mainsail - [2024-06-11]

Although its location and design may vary greatly, the mainsail is always a key source of propulsion for a ship.
Expand Down
4 changes: 2 additions & 2 deletions assets/multiqc_config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
report_comment: >
This report has been generated by the <a href="https://github.com/nf-core/reportho/releases/tag/1.0.0" target="_blank">nf-core/reportho</a>
This report has been generated by the <a href="https://github.com/nf-core/reportho/releases/tag/1.0.1" target="_blank">nf-core/reportho</a>
analysis pipeline. For information about how to interpret these results, please see the
<a href="https://nf-co.re/reportho/1.0.0/docs/output" target="_blank">documentation</a>.
<a href="https://nf-co.re/reportho/1.0.1/docs/output" target="_blank">documentation</a>.
report_section_order:
"nf-core-reportho-methods-description":
order: -1000
Expand Down
52 changes: 52 additions & 0 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@ process {

withName: 'MERGE_CSV' {
ext.args = '-f 1 --outer-join --na 0'
publishDir = [
path: { "${params.outdir}/orthologs/merge_csv" },
mode: params.publish_dir_mode,
saveAs: { filename -> filename.equals('versions.yml') ? null : filename },
enabled: params.output_intermediates
]
}

withName: 'MAKE_SCORE_TABLE' {
Expand Down Expand Up @@ -106,6 +112,15 @@ process {
]
}

withName: 'MAKE_HITS_TABLE' {
publishDir = [
path: { "${params.outdir}/orthologs/stats" },
mode: params.publish_dir_mode,
saveAs: { filename -> filename.equals('versions.yml') ? null : filename },
enabled: params.output_intermediates
]
}

withName: 'MERGE_HITS' {
ext.args = "-u 0 -k"
ext.prefix = "aggregated_hits"
Expand All @@ -116,6 +131,15 @@ process {
]
}

withName: 'MAKE_STATS' {
publishDir = [
path: { "${params.outdir}/orthologs/stats" },
mode: params.publish_dir_mode,
saveAs: { filename -> filename.equals('versions.yml') ? null : filename },
enabled: params.output_intermediates
]
}

withName: 'MERGE_STATS' {
ext.args = "-u NA"
ext.prefix = "aggregated_stats"
Expand Down Expand Up @@ -159,6 +183,16 @@ process {
]
}

withName: 'CREATE_TCOFFEETEMPLATE' {
publishDir = [
path: { "${params.outdir}/alignment/templates" },
mode: params.publish_dir_mode,
saveAs: { filename -> filename.equals('versions.yml') ? null : filename },
enabled: params.output_intermediates
]

}

withName: 'TCOFFEE_ALIGN|TCOFFEE_3DALIGN' {
publishDir = [
path: { "${params.outdir}/alignment/tcoffee" },
Expand Down Expand Up @@ -188,6 +222,15 @@ process {
]
}

withName: 'CONVERT_PHYLIP' {
publishDir = [
path: { "${params.outdir}/trees/phylip" },
mode: params.publish_dir_mode,
saveAs: { filename -> filename.equals('versions.yml') ? null : filename },
enabled: params.output_intermediates
]
}

withName: 'FASTME' {
ext.args = '-p LG' + (params.fastme_bootstrap > 0 ? ' -b ' + params.fastme_bootstrap : '')
publishDir = [
Expand Down Expand Up @@ -218,6 +261,15 @@ process {
]
}

withName: 'CONVERT_FASTA' {
publishDir = [
path: { "${params.outdir}/report/fasta" },
mode: params.publish_dir_mode,
saveAs: { filename -> filename.equals('versions.yml') ? null : filename },
enabled: params.output_intermediates
]
}

withName: 'MAKE_REPORT' {
publishDir = [
path: { "${params.outdir}/report" },
Expand Down
4 changes: 2 additions & 2 deletions modules/local/fetch_afdb_structures.nf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ process FETCH_AFDB_STRUCTURES {
fetch_afdb_structures.py $ids $prefix 2> ${prefix}_af_versions.txt

cat <<- END_VERSIONS > versions.yml
"${task.process}"
"${task.process}":
Python: \$(python --version | cut -d ' ' -f 2)
Python Requests: \$(pip show requests | grep Version | cut -d ' ' -f 2)
END_VERSIONS
Expand All @@ -41,7 +41,7 @@ process FETCH_AFDB_STRUCTURES {
touch ${prefix}_af_versions.txt

cat <<- END_VERSIONS > versions.yml
"${task.process}"
"${task.process}":
Python: \$(python --version | cut -d ' ' -f 2)
Python Requests: \$(pip show requests | grep Version | cut -d ' ' -f 2)
END_VERSIONS
Expand Down
2 changes: 1 addition & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ manifest {
description = """A pipeline for ortholog fetching and analysis"""
mainScript = 'main.nf'
nextflowVersion = '!>=23.04.0'
version = '1.0.0'
version = '1.0.1'
doi = '10.5281/zenodo.11574565'
}

Expand Down
2 changes: 1 addition & 1 deletion workflows/reportho.nf
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ workflow REPORTHO {
ch_versions = ch_versions.mix(FETCH_AFDB_STRUCTURES.out.versions)
}

ch_structures = params.use_structures ? FETCH_AFDB_STRUCTURES.out.structures : Channel.empty()
ch_structures = params.use_structures ? FETCH_AFDB_STRUCTURES.out.pdb : Channel.empty()

ALIGN (
FETCH_SEQUENCES_ONLINE.out.fasta,
Expand Down