Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/tools/azure-sdk-tools/azpysdk/Check.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ def install_dev_reqs(self, executable: str, args: argparse.Namespace, package_di
logger.info(f"Installing dev requirements for {package_dir}")
install_into_venv(executable, requirements, package_dir)
except subprocess.CalledProcessError as e:
logger.error("Failed to install dev requirements:", e)
raise e
logger.error(f"Failed to install dev requirements: {e}")
raise
finally:
if temp_req_file and temp_req_file.name:
try:
Expand Down
16 changes: 15 additions & 1 deletion eng/tools/azure-sdk-tools/azpysdk/verifytypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,21 @@ def get_type_complete_score(
f"Running verifytypes failed: {e.stderr}. See https://aka.ms/python/typing-guide for information."
)
return -1.0
report = json.loads(e.output)
try:
report = json.loads(e.output)
except (json.JSONDecodeError, TypeError):
logger.error(
f"pyright --verifytypes exited with code 1 but did not produce valid JSON output.\n"
f"stdout: {e.output}\n"
f"stderr: {e.stderr}\n"
f"Re-running without --outputjson for diagnostic output..."
)
non_json_commands = [c for c in commands[1:] if c != "--outputjson"] + ["--verbose"]
diag = self.run_venv_command(executable, non_json_commands, cwd, check=False)
logger.error(f"Diagnostic pyright stdout:\n{diag.stdout}")
if diag.stderr:
logger.error(f"Diagnostic pyright stderr:\n{diag.stderr}")
return -1.0
if check_pytyped:
pytyped_present = report["typeCompleteness"].get("pyTypedPath", None)
if not pytyped_present:
Expand Down
Loading