From 0a10ddfebc62944502c4da0e0eb95c12d80d76c1 Mon Sep 17 00:00:00 2001 From: Peter Briggs Date: Tue, 5 Dec 2023 17:01:08 +0000 Subject: [PATCH 1/2] Pin version of 'xlsxwriter' to 3.1.9. --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index c7d0459..0281f9d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,5 @@ scipy==1.5.4 matplotlib==3.3.4 pillow==8.1.1 seaborn==0.11.1 -xlsxwriter >= 0.8.4 +xlsxwriter==3.1.9 pathlib2 diff --git a/setup.py b/setup.py index 328c2ae..bd6297d 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ 'matplotlib==3.3.4', 'pillow==8.1.1', 'seaborn==0.11.1', - 'xlsxwriter >= 0.8.4', + 'xlsxwriter==3.1.9', 'pathlib2'] # Acquire package version for installation From f1930fecd52b2fc984261571c2081cf3a2964043 Mon Sep 17 00:00:00 2001 From: Peter Briggs Date: Tue, 5 Dec 2023 17:17:01 +0000 Subject: [PATCH 2/2] outputs: turn on 'constant_memory' for xlsxwriter Workbook (fixes 'merge_range' errors). --- pegs/outputs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pegs/outputs.py b/pegs/outputs.py index 3f61bf0..7520989 100644 --- a/pegs/outputs.py +++ b/pegs/outputs.py @@ -292,7 +292,8 @@ def make_xlsx_file(xlsx_file,peaks,clusters,distances,pvalues,counts, for x in clusters] # Output workbook - xlsx_out = xlsxwriter.Workbook(xlsx_file) + xlsx_out = xlsxwriter.Workbook(xlsx_file, + {'constant_memory': True}) # Make separate sheets for each set of values ws_common_genes = xlsx_out.add_worksheet("Common Genes")