From 7072a553dd58bd67ec78f658413ee302dffc0fb9 Mon Sep 17 00:00:00 2001 From: Yishi Wang Date: Tue, 10 Jun 2025 15:34:52 +0800 Subject: [PATCH 1/2] Remove msrestazure for amg extension --- src/amg/HISTORY.rst | 5 +++++ src/amg/azext_amg/_validators.py | 2 +- src/amg/setup.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/amg/HISTORY.rst b/src/amg/HISTORY.rst index 10c5e414221..beaa9c0e81a 100644 --- a/src/amg/HISTORY.rst +++ b/src/amg/HISTORY.rst @@ -137,3 +137,8 @@ Release History * `az grafana integrations monitor add`: support optional subscription id argument for multi-subscription scenarios * `az grafana integrations monitor delete`: support optional subscription id argument for multi-subscription scenarios * `az grafana notification-channel`: deprecate command group as part of Grafana legacy alerting deprecation + + +2.6.1 +++++++ +* Remove msrestazure dependency \ No newline at end of file diff --git a/src/amg/azext_amg/_validators.py b/src/amg/azext_amg/_validators.py index e905c58afe1..3d59e2f62bc 100644 --- a/src/amg/azext_amg/_validators.py +++ b/src/amg/azext_amg/_validators.py @@ -3,7 +3,7 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from msrestazure.tools import parse_resource_id +from azure.mgmt.core.tools import parse_resource_id from knack.util import CLIError diff --git a/src/amg/setup.py b/src/amg/setup.py index 8a2b44bca89..9c185aa2bb3 100644 --- a/src/amg/setup.py +++ b/src/amg/setup.py @@ -16,7 +16,7 @@ # TODO: Confirm this is the right version number you want and it matches your # HISTORY.rst entry. -VERSION = '2.6.0' +VERSION = '2.6.1' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers From 94a81af412781efbbd47fd69ddbcfa71ea29c600 Mon Sep 17 00:00:00 2001 From: Yishi Wang Date: Tue, 10 Jun 2025 15:40:20 +0800 Subject: [PATCH 2/2] fix style --- src/amg/azext_amg/_validators.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/amg/azext_amg/_validators.py b/src/amg/azext_amg/_validators.py index 3d59e2f62bc..e01e818890b 100644 --- a/src/amg/azext_amg/_validators.py +++ b/src/amg/azext_amg/_validators.py @@ -3,13 +3,12 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from azure.mgmt.core.tools import parse_resource_id - from knack.util import CLIError from azure.cli.core.commands.validators import get_default_location_from_resource_group, validate_tags from azure.cli.core.commands.client_factory import get_mgmt_service_client from azure.cli.core.profiles import ResourceType +from azure.mgmt.core.tools import parse_resource_id def process_grafana_create_namespace(cmd, namespace):