Skip to content

Commit 0d1c9fb

Browse files
Fix output formats for CI
1 parent f1b809f commit 0d1c9fb

File tree

4 files changed

+18
-19
lines changed

4 files changed

+18
-19
lines changed

ddev/src/ddev/cli/size/diff.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,9 @@ def diff_mode(
154154
if not params["format"] or params["format"] == ["png"]: # if no format is provided for the data print the table
155155
print_table(params["app"], "Status", formatted_modules)
156156

157-
treemap_path = (
158-
f"treemap_{params['platform']}_{params['version']}.png"
159-
if params["format"] and "png" in params["format"]
160-
else None
161-
)
157+
treemap_path = None
158+
if params["format"] and "png" in params["format"]:
159+
treemap_path = os.path.join("size_diff_visualizations", f"treemap_{params['platform']}_{params['version']}.png")
162160

163161
if params["show_gui"] or treemap_path:
164162
plot_treemap(
@@ -167,7 +165,7 @@ def diff_mode(
167165
f"Disk Usage Differences for {params['platform']} and Python version {params['version']}",
168166
params["show_gui"],
169167
"diff",
170-
"size_diff_visualizations" + os.sep + treemap_path,
168+
treemap_path,
171169
)
172170

173171
return formatted_modules

ddev/src/ddev/cli/size/status.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ def status_mode(
104104
if not params["format"] or params["format"] == ["png"]: # if no format is provided for the data print the table
105105
print_table(params["app"], "Status", formatted_modules)
106106

107-
treemap_path = (
108-
f"treemap_{params['platform']}_{params['version']}.png"
109-
if params["format"] and "png" in params["format"]
110-
else None
111-
)
107+
treemap_path = None
108+
if params["format"] and "png" in params["format"]:
109+
treemap_path = os.path.join(
110+
"size_status_visualizations", f"treemap_{params['platform']}_{params['version']}.png"
111+
)
112112

113113
if params["show_gui"] or treemap_path:
114114
plot_treemap(
@@ -117,7 +117,7 @@ def status_mode(
117117
f"Disk Usage Status for {params['platform']} and Python version {params['version']}",
118118
params["show_gui"],
119119
"status",
120-
"size_status_visualizations" + os.sep + treemap_path,
120+
treemap_path,
121121
)
122122

123123
return formatted_modules

ddev/src/ddev/cli/size/timeline.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,12 @@ def timeline_mode(
282282
if not params["format"] or params["format"] == ["png"]: # if no format is provided for the data print the table
283283
print_table(params["app"], "Status", formatted_modules)
284284

285-
timeline_path = (
286-
f"timeline_{params['module']}_{params['platform']}.png"
287-
if params["platform"] and params["format"] and "png" in params["format"]
288-
else f"timeline_{params['module']}.png" if params["format"] and "png" in params["format"] else None
289-
)
285+
timeline_path = None
286+
if params["format"] and "png" in params["format"]:
287+
filename = f"timeline_{params['module']}"
288+
if params["platform"]:
289+
filename = f"{filename}_{params['platform']}"
290+
timeline_path = os.path.join("size_timeline_visualizations", f"{filename}.png")
290291

291292
if params["show_gui"] or timeline_path:
292293
plot_linegraph(
@@ -295,7 +296,7 @@ def timeline_mode(
295296
params["module"],
296297
params["platform"],
297298
params["show_gui"],
298-
"size_timeline_visualizations" + os.sep + timeline_path,
299+
timeline_path,
299300
)
300301

301302
return formatted_modules

ddev/src/ddev/cli/size/utils/common_funcs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ def save_markdown(
472472
lines.append("| " + " | ".join(str(row.get(h, "")) for h in headers) + " |")
473473
lines.append("")
474474

475-
markdown = "\n".join(lines)
475+
markdown = "\n".join(lines) + '\n'
476476

477477
with open(file_path, "a", encoding="utf-8") as f:
478478
f.write(markdown)

0 commit comments

Comments
 (0)