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

Bump star version and port tests to nf-test #5529

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions modules/nf-core/star/align/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@ channels:
- bioconda
- defaults
dependencies:
- bioconda::star=2.7.10a
- bioconda::samtools=1.18
- bioconda::htslib=1.18
- conda-forge::gawk=5.1.0
- bioconda::htslib=1.19.1
- bioconda::star=2.7.11b
8 changes: 2 additions & 6 deletions modules/nf-core/star/align/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ process STAR_ALIGN {

conda "${moduleDir}/environment.yml"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/mulled-v2-1fa26d1ce03c295fe2fdcf85831a92fbcbd7e8c2:ded3841da0194af2701c780e9b3d653a85d27489-0' :
'biocontainers/mulled-v2-1fa26d1ce03c295fe2fdcf85831a92fbcbd7e8c2:ded3841da0194af2701c780e9b3d653a85d27489-0' }"
'https://depot.galaxyproject.org/singularity/star:2.7.11b--h43eeafb_1' :
'biocontainers/star:2.7.11b--h43eeafb_1' }"

input:
tuple val(meta), path(reads, stageAs: "input*/*")
Expand Down Expand Up @@ -73,8 +73,6 @@ process STAR_ALIGN {
cat <<-END_VERSIONS > versions.yml
"${task.process}":
star: \$(STAR --version | sed -e "s/STAR_//g")
samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//')
gawk: \$(echo \$(gawk --version 2>&1) | sed 's/^.*GNU Awk //; s/, .*\$//')
END_VERSIONS
"""

Expand Down Expand Up @@ -102,8 +100,6 @@ process STAR_ALIGN {
cat <<-END_VERSIONS > versions.yml
"${task.process}":
star: \$(STAR --version | sed -e "s/STAR_//g")
samtools: \$(echo \$(samtools --version 2>&1) | sed 's/^.*samtools //; s/Using.*\$//')
gawk: \$(echo \$(gawk --version 2>&1) | sed 's/^.*GNU Awk //; s/, .*\$//')
END_VERSIONS
"""
}
4 changes: 4 additions & 0 deletions modules/nf-core/star/align/tests/main.nf.test
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ nextflow_process {
[ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true) ]
])
input[1] = Channel.of([
[ id:'test_fai' ],
[ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta.fai', checkIfExists: true) ]
])
input[2] = Channel.of([
[ id:'test_gtf' ],
[ file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true) ]
])
Expand Down