Skip to content

Commit 4c156a6

Browse files
Zim Kalinowskiroot
Zim Kalinowski
authored and
root
committed
Upgraded code report (#10272)
* upgraded code report * remove garbage
1 parent 4cab01f commit 4c156a6

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

tools/azure-sdk-tools/packaging_tools/code_report.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def merge_report(report_paths):
149149
merged_report["operations"].update(report_json["operations"])
150150
return merged_report
151151

152-
def main(input_parameter: str, version: Optional[str] = None, no_venv: bool = False, pypi: bool = False, last_pypi: bool = False):
152+
def main(input_parameter: str, version: Optional[str] = None, no_venv: bool = False, pypi: bool = False, last_pypi: bool = False, output: str = None):
153153
package_name, module_name = parse_input(input_parameter)
154154
path_to_package = resolve_package_directory(package_name)
155155

@@ -177,6 +177,8 @@ def main(input_parameter: str, version: Optional[str] = None, no_venv: bool = Fa
177177
version,
178178
input_parameter
179179
]
180+
if output is not None:
181+
args.append("--output=" + output)
180182
try:
181183
subprocess.check_call(args)
182184
except subprocess.CalledProcessError:
@@ -200,7 +202,10 @@ def main(input_parameter: str, version: Optional[str] = None, no_venv: bool = Fa
200202
if module_for_path:
201203
output_filename = output_folder / Path(module_for_path+".json")
202204
else:
203-
output_filename = output_folder / Path("report.json")
205+
if output is not None:
206+
output_filename = output
207+
else:
208+
output_filename = output_folder / Path("report.json")
204209

205210
with open(output_filename, "w") as fd:
206211
json.dump(report, fd, indent=2)
@@ -209,7 +214,10 @@ def main(input_parameter: str, version: Optional[str] = None, no_venv: bool = Fa
209214

210215
if len(result) > 1:
211216
merged_report = merge_report(result)
212-
output_filename = output_folder / Path("merged_report.json")
217+
if output is not None:
218+
output_filename = output
219+
else:
220+
output_filename = output_folder / Path("merged_report.json")
213221
with open(output_filename, "w") as fd:
214222
json.dump(merged_report, fd, indent=2)
215223
_LOGGER.info(f"Merged report written to {output_filename}")
@@ -280,9 +288,11 @@ def get_sub_module_part(package_name, module_name):
280288
parser.add_argument("--debug",
281289
dest="debug", action="store_true",
282290
help="Verbosity in DEBUG mode")
283-
291+
parser.add_argument("--output",
292+
dest="output",
293+
help="Override output path.")
284294
args = parser.parse_args()
285295

286296
logging.basicConfig(level=logging.DEBUG if args.debug else logging.INFO)
287297

288-
main(args.package_name, args.version, args.no_venv, args.pypi, args.last_pypi)
298+
main(args.package_name, args.version, args.no_venv, args.pypi, args.last_pypi, args.output)

0 commit comments

Comments
 (0)