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

Updated NCBI FCS GX to 0.5.4 #101

Merged
merged 1 commit into from
Jul 19, 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
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

1. Fixed a bug where `intron_length_distribution` was used instead of `cds_length_distribution` when creating the CDS Length Distribution Graph [#95](https://github.com/Plant-Food-Research-Open/assemblyqc/issues/95)
2. Fixed a bug where 'Subsequent pipeline modules are skipped.' was printed in the `report.html` even when `contamination_stops_pipeline` was set to false
3. Changed default branch name from `master` to `main` in nf-core template files
3. Updated NCBI FCS GX to 0.5.4 [#93](https://github.com/Plant-Food-Research-Open/assemblyqc/issues/93)
4. Now NCBI FCS GX module uses all the cores available from the Nextflow task
5. Changed default branch name from `master` to `main` in nf-core template files

### `Dependencies`

Expand Down
20 changes: 14 additions & 6 deletions modules/local/ncbi_fcs_gx_screen_samples.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ process NCBI_FCS_GX_SCREEN_SAMPLES {
tag 'all samples'
label 'process_high'

conda "bioconda::ncbi-fcs-gx=0.5.0"
conda "bioconda::ncbi-fcs-gx=0.5.4"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ncbi-fcs-gx:0.5.0--h4ac6f70_3':
'biocontainers/ncbi-fcs-gx:0.5.0--h4ac6f70_3' }"
'https://depot.galaxyproject.org/singularity/ncbi-fcs-gx:0.5.4--h4ac6f70_0':
'biocontainers/ncbi-fcs-gx:0.5.4--h4ac6f70_0' }"

input:
path samples
Expand All @@ -21,12 +21,20 @@ process NCBI_FCS_GX_SCREEN_SAMPLES {
task.ext.when == null || task.ext.when

script:
def VERSION = 0.5
def VERSION = '0.5.4'
"""
export GX_NUM_CORES=$task.cpus

for sample_fasta in $samples;
do
sample_tag=\$(echo "\$sample_fasta" | sed 's/fasta.file.for.//g' | sed 's/.fasta//g')
run_gx.py --fasta ./\$sample_fasta --out-dir ./ --gx-db $db_path --tax-id "${tax_id}"

run_gx.py \\
--fasta ./\$sample_fasta \\
--out-dir ./ \\
--gx-db $db_path \\
--tax-id "${tax_id}" \\
--phone-home-label github/$workflow.manifest.name

mv "\${sample_fasta%.fasta}.${tax_id}.fcs_gx_report.txt" "\${sample_tag}.fcs_gx_report.txt"
mv "\${sample_fasta%.fasta}.${tax_id}.taxonomy.rpt" "\${sample_tag}.taxonomy.rpt"
Expand All @@ -39,7 +47,7 @@ process NCBI_FCS_GX_SCREEN_SAMPLES {
"""

stub:
def VERSION = 0.5
def VERSION = '0.5.4'
"""
for sample_fasta in $samples;
do
Expand Down