Skip to content

Commit

Permalink
Merge pull request #357 from nf-core/dev
Browse files Browse the repository at this point in the history
release 2.3.2
  • Loading branch information
rannick authored Apr 26, 2023
2 parents bbdcb3b + 12e5794 commit 13cf83d
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 6 deletions.
17 changes: 14 additions & 3 deletions bin/megafusion.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,21 @@ def build_fusioninspector_dataframe(file, map):


def read_build_fusionreport(fusionreport_file):
with open(fusionreport_file) as fusionreport:
from_html = [line.split('rows": [')[1] for line in fusionreport if 'name="fusion_list' in line]
with open(fusionreport_file) as f:
from_html = [line.split('rows": [')[1] for line in f if 'name="fusion_list' in line]
expression = from_html[0].split('], "tool')[0]
return pd.DataFrame.from_dict(ast.literal_eval(expression)).set_index("fusion")
fusion_report = pd.DataFrame.from_dict(ast.literal_eval(expression)).set_index("fusion")
if not "arriba" in fusion_report.columns:
fusion_report["arriba"] = ""
if not "fusioncatcher" in fusion_report.columns:
fusion_report["fusioncatcher"] = ""
if not "pizzly" in fusion_report.columns:
fusion_report["pizzly"] = ""
if not "squid" in fusion_report.columns:
fusion_report["squid"] = ""
if not "starfusion" in fusion_report.columns:
fusion_report["starfusion"] = ""
return fusion_report


def column_manipulation(df):
Expand Down
4 changes: 2 additions & 2 deletions modules/local/megafusion/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ process MEGAFUSION {

conda "conda-forge::python=3.8.3"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/python:3.9--1' :
'quay.io/biocontainers/python:3.9--1' }"
'https://depot.galaxyproject.org/singularity/pandas:1.5.2' :
'quay.io/biocontainers/pandas:1.5.2' }"

input:
tuple val(meta), path(tsv), path(report)
Expand Down
2 changes: 1 addition & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ manifest {
description = """Nextflow rnafusion analysis pipeline, part of the nf-core community."""
mainScript = 'main.nf'
nextflowVersion = '!>=22.10.1'
version = '2.3.0'
version = '2.3.2'
doi = ''
}

Expand Down

0 comments on commit 13cf83d

Please sign in to comment.