From 12b98bfae244b5001c859c5b0cfc361588ba5c4e Mon Sep 17 00:00:00 2001 From: Hang Date: Mon, 9 Jun 2025 15:35:06 +0800 Subject: [PATCH] Init --- doc/sphinx/azhelpgen/__init__.py | 2 -- doc/sphinx/cligroup/__init__.py | 2 -- .../azure/cli/command_modules/maps/tests/__init__.py | 2 -- .../azure/cli/command_modules/maps/tests/latest/__init__.py | 2 -- tools/automation/verify/verify_packages.py | 4 ++-- 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/doc/sphinx/azhelpgen/__init__.py b/doc/sphinx/azhelpgen/__init__.py index 73baee1e640..34913fb394d 100644 --- a/doc/sphinx/azhelpgen/__init__.py +++ b/doc/sphinx/azhelpgen/__init__.py @@ -2,5 +2,3 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -import pkg_resources -pkg_resources.declare_namespace(__name__) diff --git a/doc/sphinx/cligroup/__init__.py b/doc/sphinx/cligroup/__init__.py index 73baee1e640..34913fb394d 100644 --- a/doc/sphinx/cligroup/__init__.py +++ b/doc/sphinx/cligroup/__init__.py @@ -2,5 +2,3 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -import pkg_resources -pkg_resources.declare_namespace(__name__) diff --git a/src/azure-cli/azure/cli/command_modules/maps/tests/__init__.py b/src/azure-cli/azure/cli/command_modules/maps/tests/__init__.py index 73baee1e640..34913fb394d 100644 --- a/src/azure-cli/azure/cli/command_modules/maps/tests/__init__.py +++ b/src/azure-cli/azure/cli/command_modules/maps/tests/__init__.py @@ -2,5 +2,3 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -import pkg_resources -pkg_resources.declare_namespace(__name__) diff --git a/src/azure-cli/azure/cli/command_modules/maps/tests/latest/__init__.py b/src/azure-cli/azure/cli/command_modules/maps/tests/latest/__init__.py index 73baee1e640..34913fb394d 100644 --- a/src/azure-cli/azure/cli/command_modules/maps/tests/latest/__init__.py +++ b/src/azure-cli/azure/cli/command_modules/maps/tests/latest/__init__.py @@ -2,5 +2,3 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -import pkg_resources -pkg_resources.declare_namespace(__name__) diff --git a/tools/automation/verify/verify_packages.py b/tools/automation/verify/verify_packages.py index edf81eebb61..437444cbf43 100644 --- a/tools/automation/verify/verify_packages.py +++ b/tools/automation/verify/verify_packages.py @@ -12,7 +12,7 @@ import filecmp import logging import unittest -from pkg_resources import working_set +from importlib.metadata import distributions import automation.utilities.path as automation_path from automation.utilities.const import COMMAND_MODULE_PREFIX @@ -48,7 +48,7 @@ def test_azure_cli_installation(self): def test_azure_cli_module_installation(self): expected_modules = set([n for n, _ in automation_path.get_command_modules_paths(include_prefix=True)]) - installed_command_modules = [dist.key for dist in list(working_set) if dist.key.startswith(COMMAND_MODULE_PREFIX)] + installed_command_modules = [dist.metadata['Name'] for dist in distributions() if dist.metadata['Name'].startswith(COMMAND_MODULE_PREFIX)] logger.info('Installed command modules %s', installed_command_modules)