Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Busco tmp #111

Merged
merged 3 commits into from
Sep 13, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/sanger_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
parameters: |
{
"outdir": "${{ secrets.TOWER_WORKDIR_PARENT }}/results/${{ github.repository }}/results-${{ env.REVISION }}",
"use_work_dir_as_temp": true,
}
profiles: test,sanger,singularity,cleanup
- uses: actions/upload-artifact@v3
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
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).

## – Bellsprout – []
## [[0.6.0](https://github.com/sanger-tol/blobtoolkit/releases/tag/0.6.0)] – Bellsprout – [2024-09-13]

The pipeline has now been validated for draft (unpublished) assemblies.

Expand All @@ -17,6 +17,7 @@ The pipeline has now been validated for draft (unpublished) assemblies.
for the original Yaml configuration files of the Snakemake version.
- New option `--skip_taxon_filtering` to skip the taxon filtering in blast searches.
Mostly relevant for draft assemblies.
- Introduced the `--use_work_dir_as_temp` parameter to avoid leaving files in `/tmp`.

### Parameters

Expand All @@ -25,6 +26,7 @@ The pipeline has now been validated for draft (unpublished) assemblies.
| --yaml | |
| | --busco_lineages |
| | --skip_taxon_filtering |
| | --use_work_dir_as_temp |

> **NB:** Parameter has been **updated** if both old and new parameter information is present. </br> **NB:** Parameter has been **added** if just the new parameter information is present. </br> **NB:** Parameter has been **removed** if new parameter information isn't present.

Expand Down
3 changes: 2 additions & 1 deletion conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ process {
}

withName: "BUSCO" {
scratch = true
// Obey "use_work_dir_as_temp", except for large genomes
scratch = { !params.use_work_dir_as_temp || (meta.genome_size < 2000000000) }
ext.args = { 'test' in workflow.profile.tokenize(',') ?
// Additional configuration to speed processes up during testing.
// Note: BUSCO *must* see the double-quotes around the parameters
Expand Down
3 changes: 3 additions & 0 deletions conf/test.config
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,7 @@ params {
blastp = "${projectDir}/assets/test/mMelMel3.1.buscogenes.dmnd"
blastx = "${projectDir}/assets/test/mMelMel3.1.buscoregions.dmnd"
blastn = "${projectDir}/assets/test/nt_mMelMel3.1"

// Need to be set to avoid overfilling /tmp
use_work_dir_as_temp = true
}
3 changes: 3 additions & 0 deletions conf/test_full.config
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,7 @@ params {
blastp = "${projectDir}/assets/test_full/gfLaeSulp1.1.buscogenes.dmnd"
blastx = "${projectDir}/assets/test_full/gfLaeSulp1.1.buscoregions.dmnd"
blastn = "${projectDir}/assets/test_full/nt_gfLaeSulp1.1"

// Need to be set to avoid overfilling /tmp
use_work_dir_as_temp = true
}
3 changes: 3 additions & 0 deletions conf/test_raw.config
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,7 @@ params {
blastp = "${projectDir}/assets/test/mMelMel3.1.buscogenes.dmnd"
blastx = "${projectDir}/assets/test/mMelMel3.1.buscoregions.dmnd"
blastn = "${projectDir}/assets/test/nt_mMelMel3.1/"

// Need to be set to avoid overfilling /tmp
use_work_dir_as_temp = true
}
5 changes: 4 additions & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ params {
blastn = null
skip_taxon_filtering = false

// Execution options
use_work_dir_as_temp = false

// MultiQC options
multiqc_config = null
multiqc_title = null
Expand Down Expand Up @@ -246,7 +249,7 @@ manifest {
description = """Quality assessment of genome assemblies"""
mainScript = 'main.nf'
nextflowVersion = '!>=23.04.0'
version = '0.6.0-dev'
version = '0.6.0'
doi = '10.5281/zenodo.7949058'
}

Expand Down
18 changes: 18 additions & 0 deletions nextflow_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,21 @@
}
}
},
"execution": {
"title": "Execution",
"type": "object",
"description": "Control the execution of the pipeline.",
"default": "",
"properties": {
"use_work_dir_as_temp": {
"type": "boolean",
"description": "Set to true to make tools (e.g. sort, FastK, MerquryFK) use the work directory for their temporary files, rather than the system default.",
"fa_icon": "fas fa-arrow-circle-down",
"hidden": true
}
},
"fa_icon": "fas fa-running"
},
"institutional_config_options": {
"title": "Institutional config options",
"type": "object",
Expand Down Expand Up @@ -353,6 +368,9 @@
{
"$ref": "#/definitions/databases"
},
{
"$ref": "#/definitions/execution"
},
{
"$ref": "#/definitions/institutional_config_options"
},
Expand Down
Loading