Skip to content

Commit dbc2e0c

Browse files
mgmt, minor improvement on automation script for local run (Azure#40475)
1 parent f7c67d5 commit dbc2e0c

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

eng/mgmt/automation/generate_utils.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ def remove_generated_source_code(sdk_folder: str, namespace: str):
100100
test_folder = os.path.join(sdk_folder, "src/test/java", namespace.replace(".", "/"), "generated")
101101
sample_folder = os.path.join(sdk_folder, "src/samples/java", namespace.replace(".", "/"), "generated")
102102

103-
logging.info(f'Removing main source folder: {main_folder}')
103+
logging.info(f"Removing main source folder: {main_folder}")
104104
shutil.rmtree(main_folder, ignore_errors=True)
105105

106-
logging.info(f'Removing generated test folder: {test_folder}')
106+
logging.info(f"Removing generated test folder: {test_folder}")
107107
shutil.rmtree(test_folder, ignore_errors=True)
108108

109-
logging.info(f'Removing generated samples folder: {sample_folder}')
109+
logging.info(f"Removing generated samples folder: {sample_folder}")
110110
shutil.rmtree(sample_folder, ignore_errors=True)
111111

112112

@@ -367,7 +367,7 @@ def generate_typespec_project(
367367
]
368368

369369
if tspconfig_valid:
370-
check_call(tsp_cmd, sdk_root)
370+
check_call(tsp_cmd, sdk_root, shell=True)
371371

372372
sdk_folder = find_sdk_folder(sdk_root)
373373
logging.info("SDK folder: " + sdk_folder)
@@ -393,7 +393,7 @@ def generate_typespec_project(
393393
drop_changes(sdk_root)
394394
remove_generated_source_code(sdk_folder, f"{group_id}.{service}")
395395
# regenerate
396-
check_call(tsp_cmd, sdk_root)
396+
check_call(tsp_cmd, sdk_root, shell=True)
397397
succeeded = True
398398
except subprocess.CalledProcessError as error:
399399
error_message = (
@@ -406,9 +406,9 @@ def generate_typespec_project(
406406
return succeeded, require_sdk_integration, sdk_folder, service, module
407407

408408

409-
def check_call(cmd: List[str], work_dir: str):
409+
def check_call(cmd: List[str], work_dir: str, shell: bool = False):
410410
logging.info("Command line: " + " ".join(cmd))
411-
subprocess.check_call(cmd, cwd=work_dir)
411+
subprocess.check_call(cmd, cwd=work_dir, shell=shell)
412412

413413

414414
def drop_changes(work_dir: str):

eng/mgmt/automation/utils.py

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,19 +177,30 @@ def update_service_ci_and_pom(sdk_root: str, service: str, group: str, module: s
177177

178178

179179
def update_version(sdk_root: str, output_folder: str):
180+
# find the python command
181+
python_cmd = "python"
182+
try:
183+
subprocess.check_call([python_cmd, "--version"], shell=True)
184+
except subprocess.CalledProcessError:
185+
python_cmd = "python3"
186+
try:
187+
subprocess.check_call([python_cmd, "--version"], shell=True)
188+
except subprocess.CalledProcessError:
189+
raise Exception("python or python3 not found")
190+
180191
pwd = os.getcwd()
181192
try:
182193
os.chdir(sdk_root)
183194
print(os.getcwd())
184195
subprocess.run(
185-
"python3 eng/versioning/update_versions.py --ut library --bt client --sr",
196+
"{0} eng/versioning/update_versions.py --ut library --bt client --sr".format(python_cmd),
186197
stdout=subprocess.DEVNULL,
187198
stderr=sys.stderr,
188199
shell=True,
189200
)
190201
subprocess.run(
191-
"python3 eng/versioning/update_versions.py --ut library --bt client --tf {0}/README.md".format(
192-
output_folder
202+
"{0} eng/versioning/update_versions.py --ut library --bt client --tf {1}/README.md".format(
203+
python_cmd, output_folder
193204
),
194205
stdout=subprocess.DEVNULL,
195206
stderr=sys.stderr,

0 commit comments

Comments
 (0)