Skip to content

Commit

Permalink
Merge branch 'dev' into update_ci
Browse files Browse the repository at this point in the history
  • Loading branch information
pinin4fjords committed May 2, 2024
2 parents dbcc41e + 64f2b7b commit e060d37
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 26 deletions.
3 changes: 2 additions & 1 deletion modules/local/plot_run_gantt/main.nf
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
process PLOT_RUN_GANTT {
tag "$meta.id"

conda 'click=8.0.1 pandas=1.1.5 plotly_express=0.4.1 typing=3.10.0.0'
container 'seqeralabs/nf-aggregate:click-8.0.1_pandas-1.1.5_plotly_express-0.4.1_typing-3.10.0.0--342dabfe6548a051'
container 'seqeralabs/nf-aggregate:click-8.0.1_pandas-1.1.5_plotly_express-0.4.1_typing-3.10.0.0--ccea219dc6c3d6a1'

input:
tuple val(meta), path(run_dump)
Expand Down
2 changes: 1 addition & 1 deletion modules/local/seqera_runs_dump/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ process SEQERA_RUNS_DUMP {
cat <<-END_VERSIONS > versions.yml
"${task.process}":
seqera-cli: \$(echo \$(tw --version 2>&1) | sed 's/^.*Tower CLI version //; s/ *\$//')
seqera-cli: \$(echo \$(NO_COLOR=true tw --version 2>&1) | sed 's/^.*Tower CLI version //; s/ *\$//')
END_VERSIONS
"""
}
5 changes: 3 additions & 2 deletions modules/local/seqera_runs_dump/tests/main.nf.test.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
[
"service-info.json:md5,8e4874e8eb9e8b84e13bbb22d1e644a9",
"workflow-load.json:md5,4f02d5a24ab89aa648cd4346785c8f2c",
"workflow-metrics.json:md5,70dd1af37145c8c2d23836fe850622e7",
"workflow-metadata.json:md5,b37b4faeddf283a2c44cbe4000e4ab6e",
"workflow-metrics.json:md5,13a5b5d7447fad4a8baa053d1abf85e5",
"workflow-tasks.json:md5,577a7472816b7729012a9291d97ff150",
"workflow.json:md5,658701f8d7af1b7112534a7f58cd9aa7"
],
Expand All @@ -14,6 +15,6 @@
"nf-test": "0.8.4",
"nextflow": "23.10.1"
},
"timestamp": "2024-04-29T21:17:42.262920662"
"timestamp": "2024-05-01T10:26:02.841222889"
}
}
29 changes: 7 additions & 22 deletions workflows/nf_aggregate/tests/main.nf.test.snap
Original file line number Diff line number Diff line change
@@ -1,30 +1,15 @@
{
"Parameters: default": {
"content": [
{
"0": [

],
"1": [

],
"multiqc_report": [

],
"versions": [

]
}
],
"timestamp": "2023-12-04T10:38:26.10265603"
},
"Should run without failures": {
"content": [
[
"versions.yml:md5,1294de7c9d8f7ce29bbb3a638ac1d108",
"versions.yml:md5,43372d67fa3f029a02cc64a571d88e13"
"versions.yml:md5,8ab950fb3e4c32ce4745551fa9a4b8e7",
"versions.yml:md5,f3cf523314479fcfc842e81116af8ab4"
]
],
"timestamp": "2023-12-04T15:47:00.36029546"
"meta": {
"nf-test": "0.8.4",
"nextflow": "23.10.1"
},
"timestamp": "2024-05-02T13:45:38.806631609"
}
}

0 comments on commit e060d37

Please sign in to comment.