Skip to content

Commit 49e6e88

Browse files
Update documentation and scripts to replace 'package-dir' with 'emitter-output-dir' for TypeSpec configuration (#43170)
1 parent 2954898 commit 49e6e88

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

eng/tools/azure-sdk-tools/packaging_tools/generate_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ def del_outdated_generated_files(tsp: str):
5454
service_dir = typespec_python_config.get("service-dir") or content.get("parameters", {}).get("service-dir", {}).get(
5555
"default", ""
5656
)
57-
package_dir = typespec_python_config.get("package-dir", "")
57+
package_dir = typespec_python_config.get("emitter-output-dir", "").split("/")[-1]
5858
if not service_dir or not package_dir:
59-
_LOGGER.info(f"do not find service-dir or package-dir in tspconfig.yaml: {tspconfig}")
59+
_LOGGER.info(f"do not find service-dir or emitter-output-dir in tspconfig.yaml: {tspconfig}")
6060
return
6161
generated_files_dir = Path(service_dir) / package_dir / package_dir.split("-")[0]
6262
# remove outdated generated files

scripts/release_helper/python.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,7 @@ def package_name_output_folder_from_tspconfig(self):
147147
emitters = yaml_contents.get("options", {})
148148
for emitter_name in emitters:
149149
if "/typespec-python" in emitter_name:
150-
for dir in ["package-dir", "emitter-output-dir"]:
151-
self.package_name = emitters[emitter_name].get(dir, "").split("/")[-1]
152-
if self.package_name:
153-
break
150+
self.package_name = emitters[emitter_name].get("emitter-output-dir", "").split("/")[-1]
154151
break
155152

156153
@property

0 commit comments

Comments
 (0)