From bde2e098f6d83d0691bc536b82055175d3b037c0 Mon Sep 17 00:00:00 2001 From: Joel Tony Date: Thu, 18 Jul 2024 17:50:14 +0530 Subject: [PATCH 1/2] Update operation.py for Drishti v0.8 compatibility --- explorer/plots/operation.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/explorer/plots/operation.py b/explorer/plots/operation.py index e68e5e9..c95c514 100644 --- a/explorer/plots/operation.py +++ b/explorer/plots/operation.py @@ -883,9 +883,7 @@ def determine_legend(fig, column): size = 176 file = options["file1"].split(".darshan")[0] -command = "drishti --html --light --size {} --json {} {}.darshan".format( - size, json_file_path, file -) +command = f"drishti --html --light --size {size} --export_dir {os.path.dirname(file)} --json {json_file_path} {file}.darshan" args = shlex.split(command) s = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) sOutput, sError = s.communicate() @@ -901,10 +899,10 @@ def determine_legend(fig, column): with open(options["output"], "r") as html_file: output_doc.body.extend(BeautifulSoup(html_file.read(), "html.parser").body) - with open(file + ".darshan.html", "r") as html_file: + with open(file + ".html", "r") as html_file: output_doc.head.extend(BeautifulSoup(html_file.read(), "html.parser").head) - with open(file + ".darshan.html", "r") as html_file: + with open(file + ".html", "r") as html_file: output_doc.body.extend(BeautifulSoup(html_file.read(), "html.parser").body) output_doc.style.append(BeautifulSoup("pre { padding-left: 60px;}", "html.parser")) From 1dfdc2bd34e66318a03a3888acc3d49895b3ac50 Mon Sep 17 00:00:00 2001 From: Joel Tony Date: Thu, 18 Jul 2024 17:50:49 +0530 Subject: [PATCH 2/2] chore: update drishti-io dependency to v0.8 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 534efcc..0f9bdfe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,4 @@ pyranges>=0.0.120 darshan pyarrow>=10.0.1 bs4>=0.0.1 -drishti-io>=0.5 +drishti-io>=0.8