From 588bd2da48efa5fb3ccce9c35fb394e7df60fa4a Mon Sep 17 00:00:00 2001 From: Libba Lawrence Date: Fri, 24 Apr 2026 10:17:40 -0700 Subject: [PATCH 1/6] testing fix Co-authored-by: Copilot --- sdk/appnetwork/azure-mgmt-appnetwork/pyproject.toml | 2 +- sdk/horizondb/azure-mgmt-horizondb/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/appnetwork/azure-mgmt-appnetwork/pyproject.toml b/sdk/appnetwork/azure-mgmt-appnetwork/pyproject.toml index a0d59002a4e5..6ca63e425a04 100644 --- a/sdk/appnetwork/azure-mgmt-appnetwork/pyproject.toml +++ b/sdk/appnetwork/azure-mgmt-appnetwork/pyproject.toml @@ -11,7 +11,7 @@ authors = [ { name = "Microsoft Corporation", email = "azpysdkhelp@microsoft.com" }, ] description = "Microsoft Azure Appnetwork Management Client Library for Python" -license = "MIT" +license = {text = "MIT License"} classifiers = [ "Development Status :: 4 - Beta", "Programming Language :: Python", diff --git a/sdk/horizondb/azure-mgmt-horizondb/pyproject.toml b/sdk/horizondb/azure-mgmt-horizondb/pyproject.toml index f86dfe0c7b95..7e6901a9c45f 100644 --- a/sdk/horizondb/azure-mgmt-horizondb/pyproject.toml +++ b/sdk/horizondb/azure-mgmt-horizondb/pyproject.toml @@ -11,7 +11,7 @@ authors = [ { name = "Microsoft Corporation", email = "azpysdkhelp@microsoft.com" }, ] description = "Microsoft Azure Horizondb Management Client Library for Python" -license = "MIT" +license = {text = "MIT License"} classifiers = [ "Development Status :: 4 - Beta", "Programming Language :: Python", From 57dab8cef5d7f99b16dcb84aa30aca7c4daf5ff6 Mon Sep 17 00:00:00 2001 From: Libba Lawrence Date: Fri, 24 Apr 2026 10:18:09 -0700 Subject: [PATCH 2/6] verbose output --- eng/tools/azure-sdk-tools/azpysdk/verifytypes.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/eng/tools/azure-sdk-tools/azpysdk/verifytypes.py b/eng/tools/azure-sdk-tools/azpysdk/verifytypes.py index ca7d45b2f3ac..85d3874d6e3d 100644 --- a/eng/tools/azure-sdk-tools/azpysdk/verifytypes.py +++ b/eng/tools/azure-sdk-tools/azpysdk/verifytypes.py @@ -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: From c6cd62f521dd5ca0048b71fb6a04648148c6d792 Mon Sep 17 00:00:00 2001 From: Libba Lawrence Date: Fri, 24 Apr 2026 10:47:06 -0700 Subject: [PATCH 3/6] we dont support 3.9 anymore --- pyrightconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyrightconfig.json b/pyrightconfig.json index 23f5155848f6..96a010d3b045 100644 --- a/pyrightconfig.json +++ b/pyrightconfig.json @@ -1,5 +1,5 @@ { "reportTypeCommentUsage": true, "reportMissingImports": false, - "pythonVersion": "3.9" + "pythonVersion": "3.10" } From d47fcb8d7c150ced37773297b0b3935c592e331a Mon Sep 17 00:00:00 2001 From: Libba Lawrence Date: Fri, 24 Apr 2026 10:58:04 -0700 Subject: [PATCH 4/6] update verifytypes pyright --- eng/tools/azure-sdk-tools/azpysdk/verifytypes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/tools/azure-sdk-tools/azpysdk/verifytypes.py b/eng/tools/azure-sdk-tools/azpysdk/verifytypes.py index 85d3874d6e3d..6c716c967302 100644 --- a/eng/tools/azure-sdk-tools/azpysdk/verifytypes.py +++ b/eng/tools/azure-sdk-tools/azpysdk/verifytypes.py @@ -18,7 +18,7 @@ from ci_tools.functions import get_pip_command from ci_tools.logging import logger -PYRIGHT_VERSION = "1.1.287" +PYRIGHT_VERSION = "1.1.407" REPO_ROOT = discover_repo_root() From 9976b75c0eb24ac9aedf58d146fee65bbcd29fff Mon Sep 17 00:00:00 2001 From: Libba Lawrence Date: Fri, 24 Apr 2026 10:59:25 -0700 Subject: [PATCH 5/6] add guard --- eng/tools/azure-sdk-tools/azpysdk/verifytypes.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/eng/tools/azure-sdk-tools/azpysdk/verifytypes.py b/eng/tools/azure-sdk-tools/azpysdk/verifytypes.py index 6c716c967302..a6c25465ad04 100644 --- a/eng/tools/azure-sdk-tools/azpysdk/verifytypes.py +++ b/eng/tools/azure-sdk-tools/azpysdk/verifytypes.py @@ -222,5 +222,19 @@ def get_type_complete_score( return report["typeCompleteness"]["completenessScore"] # library scores 100% - report = json.loads(response.stdout) + try: + report = json.loads(response.stdout) + except (json.JSONDecodeError, TypeError): + logger.error( + f"pyright --verifytypes exited successfully but did not produce valid JSON output.\n" + f"stdout: {response.stdout}\n" + f"stderr: {response.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 return report["typeCompleteness"]["completenessScore"] From ca2cca6181dcd8ba584af550811cf2c1cfdce131 Mon Sep 17 00:00:00 2001 From: Libba Lawrence Date: Fri, 24 Apr 2026 11:21:58 -0700 Subject: [PATCH 6/6] Revert unrelated pyproject.toml license changes Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- sdk/appnetwork/azure-mgmt-appnetwork/pyproject.toml | 2 +- sdk/horizondb/azure-mgmt-horizondb/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/appnetwork/azure-mgmt-appnetwork/pyproject.toml b/sdk/appnetwork/azure-mgmt-appnetwork/pyproject.toml index 6ca63e425a04..a0d59002a4e5 100644 --- a/sdk/appnetwork/azure-mgmt-appnetwork/pyproject.toml +++ b/sdk/appnetwork/azure-mgmt-appnetwork/pyproject.toml @@ -11,7 +11,7 @@ authors = [ { name = "Microsoft Corporation", email = "azpysdkhelp@microsoft.com" }, ] description = "Microsoft Azure Appnetwork Management Client Library for Python" -license = {text = "MIT License"} +license = "MIT" classifiers = [ "Development Status :: 4 - Beta", "Programming Language :: Python", diff --git a/sdk/horizondb/azure-mgmt-horizondb/pyproject.toml b/sdk/horizondb/azure-mgmt-horizondb/pyproject.toml index 7e6901a9c45f..f86dfe0c7b95 100644 --- a/sdk/horizondb/azure-mgmt-horizondb/pyproject.toml +++ b/sdk/horizondb/azure-mgmt-horizondb/pyproject.toml @@ -11,7 +11,7 @@ authors = [ { name = "Microsoft Corporation", email = "azpysdkhelp@microsoft.com" }, ] description = "Microsoft Azure Horizondb Management Client Library for Python" -license = {text = "MIT License"} +license = "MIT" classifiers = [ "Development Status :: 4 - Beta", "Programming Language :: Python",