Skip to content

Commit f3781de

Browse files
authored
Merge pull request #156 from nf-core/fix-help-1
Updates r packages & uses wave for container(s)
2 parents e18909c + d4a7cc0 commit f3781de

File tree

7 files changed

+419
-243
lines changed

7 files changed

+419
-243
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
### `Fixed`
99

10+
- Addressed issues with latest GSVA function calls after GSVA >1.5.0 was introduced to be able to use gene score methods accordingly again
11+
- Updated the analysis dependencies in the local module for gene score computation to latest versions of the R Scripts
12+
- Removed container dependency on biocontainers and rather using Wave containers again
13+
14+
### `Fixed`
15+
1016
- [#151](https://github.com/nf-core/nanostring/pull/151) - Updated modules and subworkflows, and follow nextflow's strict syntax.
1117

1218
### `Changed`

modules/local/compute_gene_scores/environment.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ channels:
22
- conda-forge
33
- bioconda
44
dependencies:
5-
- conda-forge::r-yaml=2.3.7
6-
- conda-forge::r-ggplot2=3.4.4
5+
- conda-forge::r-yaml=2.3.12
6+
- conda-forge::r-ggplot2=4.0.1
77
- conda-forge::r-dplyr=1.1.4
8-
- conda-forge::r-stringr=1.5.0
9-
- bioconda::bioconductor-gsva=1.46.0
10-
- bioconda::bioconductor-singscore=1.18.0
11-
- conda-forge::r-factominer=2.8.0
12-
- conda-forge::r-tibble=3.2.1
13-
- conda-forge::r-matrixstats=1.1.0
8+
- conda-forge::r-stringr=1.6.0
9+
- bioconda::bioconductor-gsva=2.0.0
10+
- bioconda::bioconductor-singscore=1.26.0
11+
- conda-forge::r-factominer=2.13.0
12+
- conda-forge::r-tibble=3.3.1
13+
- conda-forge::r-matrixstats=1.5.0

modules/local/compute_gene_scores/main.nf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ process COMPUTE_GENE_SCORES {
22
label 'process_single'
33

44
conda "${moduleDir}/environment.yml"
5-
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
6-
'https://depot.galaxyproject.org/singularity/mulled-v2-e6920e60d80922852a1b19630ebe16754cf5320d:75e2c0a29159bae8a964e43ae16a45c282fdf651-0' :
7-
'biocontainers/mulled-v2-e6920e60d80922852a1b19630ebe16754cf5320d:75e2c0a29159bae8a964e43ae16a45c282fdf651-0' }"
5+
container "community.wave.seqera.io/library/bioconductor-gsva_bioconductor-singscore_r-dplyr_r-factominer_pruned:e6f1a5cd9110d36b"
86

97
input:
108
tuple val(meta), path(normalized_counts)

0 commit comments

Comments
 (0)