Skip to content

Commit

Permalink
Merge pull request #906 from maxulysse/3.1.2
Browse files Browse the repository at this point in the history
Release 3.1.2
  • Loading branch information
maxulysse authored Jan 5, 2023
2 parents 96749f7 + bfd426e commit c87f4eb
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 4 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
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).

## [3.1.2](https://github.com/nf-core/sarek/releases/tag/3.1.2) - Lesser Lule River

Lesser Lule River is English for Lilla Luleälven

### Added

### Changed

### Fixed

- [#905](https://github.com/nf-core/sarek/pull/905) - Remove usages of deprecated `Channel.from` method

### Deprecated

### Removed

### Dependencies

## [3.1.1](https://github.com/nf-core/sarek/releases/tag/3.1.1) - Lilla Luleälven

Lilla Luleälven river's main affluent is Rapaätno.
Expand Down
2 changes: 1 addition & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ manifest {
description = 'An open-source analysis pipeline to detect germline or somatic variants from whole genome or targeted sequencing'
mainScript = 'main.nf'
nextflowVersion = '!>=21.10.3'
version = '3.1.1'
version = '3.1.2'
doi = '10.12688/f1000research.16665.2, 10.5281/zenodo.4063683'
}

Expand Down
6 changes: 3 additions & 3 deletions workflows/sarek.nf
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ workflow SAREK {
ch_multiqc_files = ch_multiqc_files.mix(ch_methods_description.collectFile(name: 'methods_description_mqc.yaml'))
ch_multiqc_files = ch_multiqc_files.mix(ch_reports.collect().ifEmpty([]))

ch_multiqc_configs = Channel.from(ch_multiqc_config).mix(ch_multiqc_custom_config).ifEmpty([])
ch_multiqc_configs = ch_multiqc_config.mix(ch_multiqc_custom_config).ifEmpty([])

MULTIQC (
ch_multiqc_files.collect(),
Expand Down Expand Up @@ -1134,7 +1134,7 @@ def extract_csv(csv_file) {
def patient_sample_lane_combinations_in_samplesheet = []
def sample2patient = [:]

Channel.from(csv_file).splitCsv(header: true)
Channel.of(csv_file).splitCsv(header: true)
.map{ row ->
if (params.step == "mapping") {
if ( !row.lane ) { // This also handles the case where the lane is left as an empty string
Expand All @@ -1161,7 +1161,7 @@ def extract_csv(csv_file) {
sample_count_normal = 0
sample_count_tumor = 0

Channel.from(csv_file).splitCsv(header: true)
Channel.of(csv_file).splitCsv(header: true)
//Retrieves number of lanes by grouping together by patient and sample and counting how many entries there are for this combination
.map{ row ->
sample_count_all++
Expand Down

0 comments on commit c87f4eb

Please sign in to comment.