Skip to content

Commit

Permalink
chore: bump picard (#5948)
Browse files Browse the repository at this point in the history
* bump picard

* fix hsmetrics test

* fix markduplicates

* fix extractfingerprints

* fix addorreplacereadgroups

* fix crosscheckfingerprints
  • Loading branch information
matthdsm authored Jul 10, 2024
1 parent 45d482f commit 0dee12b
Show file tree
Hide file tree
Showing 50 changed files with 159 additions and 599 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ channels:
- bioconda
- defaults
dependencies:
- bioconda::picard=3.1.1
- bioconda::picard=3.2.0
4 changes: 2 additions & 2 deletions modules/nf-core/picard/addorreplacereadgroups/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ process PICARD_ADDORREPLACEREADGROUPS {

conda "${moduleDir}/environment.yml"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/picard:3.1.1--hdfd78af_0' :
'biocontainers/picard:3.1.1--hdfd78af_0' }"
'https://depot.galaxyproject.org/singularity/picard:3.2.0--hdfd78af_0' :
'biocontainers/picard:3.2.0--hdfd78af_0' }"

input:
tuple val(meta), path(reads)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"content": [
"test.replaced.cram",
[
"versions.yml:md5,0a6f049f94501dcf23aabfbc0e272891"
"versions.yml:md5,7ec6e56d1d70ed028928dc82b32b27cd"
]
],
"meta": {
"nf-test": "0.8.4",
"nextflow": "23.10.1"
"nextflow": "24.04.2"
},
"timestamp": "2024-03-21T12:05:47.668865"
"timestamp": "2024-07-10T09:54:40.471730168"
},
"sarscov2 - bam - stub": {
"content": [
Expand All @@ -30,7 +30,7 @@

],
"3": [
"versions.yml:md5,0a6f049f94501dcf23aabfbc0e272891"
"versions.yml:md5,7ec6e56d1d70ed028928dc82b32b27cd"
],
"bai": [

Expand All @@ -47,28 +47,28 @@

],
"versions": [
"versions.yml:md5,0a6f049f94501dcf23aabfbc0e272891"
"versions.yml:md5,7ec6e56d1d70ed028928dc82b32b27cd"
]
}
],
"meta": {
"nf-test": "0.8.4",
"nextflow": "23.10.1"
"nextflow": "24.04.2"
},
"timestamp": "2024-03-21T10:51:24.530553"
"timestamp": "2024-07-10T09:55:08.402649243"
},
"sarscov2 - bam": {
"content": [
"null.replaced.bam",
"null.replaced.bai",
[
"versions.yml:md5,0a6f049f94501dcf23aabfbc0e272891"
"versions.yml:md5,7ec6e56d1d70ed028928dc82b32b27cd"
]
],
"meta": {
"nf-test": "0.8.4",
"nextflow": "23.10.1"
"nextflow": "24.04.2"
},
"timestamp": "2024-03-21T12:05:29.696728"
"timestamp": "2024-07-10T09:54:22.239968953"
}
}
2 changes: 1 addition & 1 deletion modules/nf-core/picard/bedtointervallist/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ channels:
- bioconda
- defaults
dependencies:
- bioconda::picard=3.1.1
- bioconda::picard=3.2.0
4 changes: 2 additions & 2 deletions modules/nf-core/picard/bedtointervallist/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ process PICARD_BEDTOINTERVALLIST {

conda "${moduleDir}/environment.yml"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/picard:3.1.1--hdfd78af_0' :
'biocontainers/picard:3.1.1--hdfd78af_0' }"
'https://depot.galaxyproject.org/singularity/picard:3.2.0--hdfd78af_0' :
'biocontainers/picard:3.2.0--hdfd78af_0' }"

input:
tuple val(meta) , path(bed)
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/picard/cleansam/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ channels:
- bioconda
- defaults
dependencies:
- bioconda::picard=3.1.1
- bioconda::picard=3.2.0
4 changes: 2 additions & 2 deletions modules/nf-core/picard/cleansam/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ process PICARD_CLEANSAM {

conda "${moduleDir}/environment.yml"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/picard:3.1.1--hdfd78af_0' :
'biocontainers/picard:3.1.1--hdfd78af_0' }"
'https://depot.galaxyproject.org/singularity/picard:3.2.0--hdfd78af_0' :
'biocontainers/picard:3.2.0--hdfd78af_0' }"

input:
tuple val(meta), path(bam)
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/picard/collecthsmetrics/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ channels:
- bioconda
- defaults
dependencies:
- bioconda::picard=3.1.1
- bioconda::picard=3.2.0
4 changes: 2 additions & 2 deletions modules/nf-core/picard/collecthsmetrics/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ process PICARD_COLLECTHSMETRICS {

conda "${moduleDir}/environment.yml"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/picard:3.1.1--hdfd78af_0' :
'biocontainers/picard:3.1.1--hdfd78af_0' }"
'https://depot.galaxyproject.org/singularity/picard:3.2.0--hdfd78af_0' :
'biocontainers/picard:3.2.0--hdfd78af_0' }"

input:
tuple val(meta), path(bam), path(bai), path(bait_intervals, stageAs: "baits/*"), path(target_intervals, stageAs: 'targets/*')
Expand Down
8 changes: 4 additions & 4 deletions modules/nf-core/picard/collecthsmetrics/tests/main.nf.test
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ nextflow_process {

then {
def size = path(process.out.metrics[0][1]).size()
def lines = path(process.out.metrics[0][1]).readLines()[0..212]
def lines = path(process.out.metrics[0][1]).readLines()[0..100]
lines.remove(3) // remove timestamp
assertAll(
{ assert process.success },
Expand Down Expand Up @@ -97,7 +97,7 @@ nextflow_process {

then {
def size = path(process.out.metrics[0][1]).size()
def lines = path(process.out.metrics[0][1]).readLines()[0..212]
def lines = path(process.out.metrics[0][1]).readLines()[0..100]
lines.remove(3) // remove timestamp
assertAll(
{ assert process.success },
Expand Down Expand Up @@ -135,7 +135,7 @@ nextflow_process {

then {
def size = path(process.out.metrics[0][1]).size()
def lines = path(process.out.metrics[0][1]).readLines()[0..212]
def lines = path(process.out.metrics[0][1]).readLines()[0..100]
lines.remove(3) // remove timestamp
assertAll(
{ assert process.success },
Expand Down Expand Up @@ -173,7 +173,7 @@ nextflow_process {

then {
def size = path(process.out.metrics[0][1]).size()
def lines = path(process.out.metrics[0][1]).readLines()[0..212]
def lines = path(process.out.metrics[0][1]).readLines()[0..100]
lines.remove(3) // remove timestamp
assertAll(
{ assert process.success },
Expand Down
Loading

0 comments on commit 0dee12b

Please sign in to comment.