# HG changeset patch # User iuc # Date 1766131771 0 # Node ID 702bdf59d6c8c9b10d0a4002556f11d9260545c5 # Parent 1cb33de18af5638d296ff67fff98bb627c3a0d61 planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/main/tools/deseq2 commit 2bcb448af8311320be0a970be37aa8ea4eed66b9 diff -r 1cb33de18af5 -r 702bdf59d6c8 deseq2.R --- a/deseq2.R Tue Dec 09 17:43:58 2025 +0000 +++ b/deseq2.R Fri Dec 19 08:09:31 2025 +0000 @@ -127,12 +127,19 @@ trim <- function(x) gsub("^\\s+|\\s+$", "", x) +# Helper function to decode base64-encoded JSON +decode_base64_json <- function(encoded_str) { + decoded_bytes <- base64enc::base64decode(encoded_str) + decoded_str <- rawToChar(decoded_bytes) + return(decoded_str) +} + # switch on if 'factors' was provided: library("rjson") if (!is.null(opt$sample_sheet_mode)) { # Sample sheet mode: build factor_list from sample sheet - filenames_to_labels <- fromJSON(opt$files_to_labels) + filenames_to_labels <- fromJSON(decode_base64_json(opt$files_to_labels)) # Read sample sheet sample_sheet <- read.table(opt$sample_sheet, sep = "\t", header = TRUE, stringsAsFactors = FALSE) @@ -341,9 +348,9 @@ } else { # Original mode: factors provided directly parser <- newJSONParser() - parser$addData(opt$factors) + parser$addData(decode_base64_json(opt$factors)) factor_list <- parser$getObject() - filenames_to_labels <- fromJSON(opt$files_to_labels) + filenames_to_labels <- fromJSON(decode_base64_json(opt$files_to_labels)) # For original mode, extract reference and target levels from the first factor # In original mode: ref=level1 (denominator), target=level2 (numerator) -> log2(level2/level1) diff -r 1cb33de18af5 -r 702bdf59d6c8 deseq2.xml --- a/deseq2.xml Tue Dec 09 17:43:58 2025 +0000 +++ b/deseq2.xml Fri Dec 19 08:09:31 2025 +0000 @@ -38,6 +38,7 @@ #import json #import os +#import base64 Rscript '${__tool_directory__}/deseq2.R' --cores \${GALAXY_SLOTS:-1} -o '$deseq_out' @@ -90,13 +91,13 @@ #for $group in $level.groups.value: #for $file in $select_data.countsFile.get_datasets_for_group($group): $count_files.append(str($file)) - $filename_to_element_identifiers.__setitem__(os.path.basename(str($file)), $file.element_identifier) + $filename_to_element_identifiers.__setitem__(os.path.basename(str($file)), $file.element_identifier) #end for #end for #else: #for $file in $level.countsFile: $count_files.append(str($file)) - $filename_to_element_identifiers.__setitem__(os.path.basename(str($file)), $file.element_identifier) + $filename_to_element_identifiers.__setitem__(os.path.basename(str($file)), $file.element_identifier) #end for #end if $temp_factor.append( {str($level.factorLevel): $count_files} ) @@ -109,9 +110,9 @@ $header #if $select_data.how != 'sample_sheet_contrasts': - -f '#echo json.dumps(temp_factor_names)#' + -f '#echo base64.b64encode(json.dumps(temp_factor_names).encode()).decode()#' #end if - -l '#echo json.dumps(filename_to_element_identifiers)#' + -l '#echo base64.b64encode(json.dumps(filename_to_element_identifiers).encode()).decode()#' #if $advanced_options.esf_cond.esf: #if $advanced_options.esf_cond.esf == "user": -e $advanced_options.esf_cond.size_factor_input @@ -154,7 +155,7 @@ - + @@ -165,7 +166,7 @@ - + @@ -174,8 +175,7 @@ - - + @@ -192,8 +192,7 @@ - - + diff -r 1cb33de18af5 -r 702bdf59d6c8 macros.xml --- a/macros.xml Tue Dec 09 17:43:58 2025 +0000 +++ b/macros.xml Fri Dec 19 08:09:31 2025 +0000 @@ -18,6 +18,10 @@ + + + + bioconductor-deseq2 @@ -30,6 +34,7 @@ r-gplots r-pheatmap r-rjson + r-base64enc 2.11.40.8