From 9b8657589e9e7a36a48cf52bbdd4af4e4fe2898f Mon Sep 17 00:00:00 2001 From: necusjz Date: Tue, 10 Feb 2026 14:02:10 +1100 Subject: [PATCH 1/2] ci: fix --- src/blueprint/HISTORY.rst | 5 +++++ src/blueprint/azext_blueprint/vendored_sdks/__init__.py | 2 -- src/blueprint/setup.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/blueprint/HISTORY.rst b/src/blueprint/HISTORY.rst index f4bde44066f..a2692822851 100644 --- a/src/blueprint/HISTORY.rst +++ b/src/blueprint/HISTORY.rst @@ -2,6 +2,11 @@ Release History =============== + +1.0.0b2 ++++++ +* Remove `__import__('pkg_resources').declare_namespace(__name__)` to fix the namespace package issue. + 1.0.0b1 +++++ * Deprecate blueprint commands diff --git a/src/blueprint/azext_blueprint/vendored_sdks/__init__.py b/src/blueprint/azext_blueprint/vendored_sdks/__init__.py index a5b81f3bde4..34913fb394d 100644 --- a/src/blueprint/azext_blueprint/vendored_sdks/__init__.py +++ b/src/blueprint/azext_blueprint/vendored_sdks/__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').declare_namespace(__name__) diff --git a/src/blueprint/setup.py b/src/blueprint/setup.py index 2264a5e387b..08f8b124603 100644 --- a/src/blueprint/setup.py +++ b/src/blueprint/setup.py @@ -16,7 +16,7 @@ # TODO: Confirm this is the right version number you want and it matches your # HISTORY.rst entry. -VERSION = '1.0.0b1' +VERSION = '1.0.0b2' # The full list of classifiers is available at From faf0cd4d82d4b3a657fa45cbaa928f6c73d3eab7 Mon Sep 17 00:00:00 2001 From: necusjz Date: Wed, 11 Feb 2026 03:19:58 +1100 Subject: [PATCH 2/2] ci: fix --- .../tests/latest/recordings/test_blueprint.yaml | 4 ++-- .../latest/recordings/test_blueprint_assignment.yaml | 12 ++++++------ .../latest/recordings/test_blueprint_import.yaml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/blueprint/azext_blueprint/tests/latest/recordings/test_blueprint.yaml b/src/blueprint/azext_blueprint/tests/latest/recordings/test_blueprint.yaml index 37f30bb962c..67343080c44 100644 --- a/src/blueprint/azext_blueprint/tests/latest/recordings/test_blueprint.yaml +++ b/src/blueprint/azext_blueprint/tests/latest/recordings/test_blueprint.yaml @@ -15,7 +15,7 @@ interactions: User-Agent: - AZURECLI/2.51.0 azsdk-python-azure-mgmt-resource/23.1.0b2 Python/3.9.5 (Windows-10-10.0.22621-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_blueprint000001?api-version=2022-09-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_blueprint000001?api-version=2024-11-01 response: body: string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_blueprint000001","name":"cli_test_blueprint000001","type":"Microsoft.Resources/resourceGroups","location":"westus","tags":{"product":"azurecli","cause":"automation","test":"test_blueprint","date":"2023-08-10T03:17:10Z","module":"blueprint"},"properties":{"provisioningState":"Succeeded"}}' @@ -61,7 +61,7 @@ interactions: User-Agent: - AZURECLI/2.51.0 azsdk-python-azure-mgmt-msi/7.0.0 Python/3.9.5 (Windows-10-10.0.22621-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_blueprint000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testid_000004?api-version=2023-01-31 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_blueprint000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testid_000004?api-version=2024-11-30 response: body: string: '{"location":"westus","tags":{},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_blueprint000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testid_000004","name":"testid_000004","type":"Microsoft.ManagedIdentity/userAssignedIdentities","properties":{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","principalId":"5f72f451-8f84-4052-b3b4-461584f37db8","clientId":"3b474454-65d4-4e53-bce6-42488649961f"}}' diff --git a/src/blueprint/azext_blueprint/tests/latest/recordings/test_blueprint_assignment.yaml b/src/blueprint/azext_blueprint/tests/latest/recordings/test_blueprint_assignment.yaml index 2a0b35eadc4..37ea22d3532 100644 --- a/src/blueprint/azext_blueprint/tests/latest/recordings/test_blueprint_assignment.yaml +++ b/src/blueprint/azext_blueprint/tests/latest/recordings/test_blueprint_assignment.yaml @@ -15,7 +15,7 @@ interactions: User-Agent: - AZURECLI/2.51.0 azsdk-python-azure-mgmt-resource/23.1.0b2 Python/3.9.5 (Windows-10-10.0.22621-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_blueprint_assignment000001?api-version=2022-09-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_blueprint_assignment000001?api-version=2024-11-01 response: body: string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_blueprint_assignment000001","name":"cli_test_blueprint_assignment000001","type":"Microsoft.Resources/resourceGroups","location":"westus","tags":{"product":"azurecli","cause":"automation","test":"test_blueprint_assignment","date":"2023-08-10T03:18:22Z","module":"blueprint"},"properties":{"provisioningState":"Succeeded"}}' @@ -61,7 +61,7 @@ interactions: User-Agent: - AZURECLI/2.51.0 azsdk-python-azure-mgmt-msi/7.0.0 Python/3.9.5 (Windows-10-10.0.22621-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_blueprint_assignment000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testid_000004?api-version=2023-01-31 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_blueprint_assignment000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testid_000004?api-version=2024-11-30 response: body: string: '{"location":"westus","tags":{},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_blueprint_assignment000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testid_000004","name":"testid_000004","type":"Microsoft.ManagedIdentity/userAssignedIdentities","properties":{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","principalId":"93d9ffd9-a7f1-48b0-bf4b-f9919f3b5411","clientId":"576229e8-c4da-49eb-a0da-16c5c7cfb23c"}}' @@ -748,7 +748,7 @@ interactions: User-Agent: - AZURECLI/2.51.0 azsdk-python-azure-mgmt-authorization/3.0.0 Python/3.9.5 (Windows-10-10.0.22621-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions?$filter=roleName%20eq%20%27Owner%27&api-version=2022-04-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions?$filter=roleName%20eq%20%27Owner%27&api-version=2022-05-01-preview response: body: string: '{"value":[{"properties":{"roleName":"Owner","type":"BuiltInRole","description":"Grants @@ -795,7 +795,7 @@ interactions: User-Agent: - AZURECLI/2.51.0 azsdk-python-azure-mgmt-authorization/3.0.0 Python/3.9.5 (Windows-10-10.0.22621-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions?$filter=roleName%20eq%20%27Owner%27&api-version=2022-04-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions?$filter=roleName%20eq%20%27Owner%27&api-version=2022-05-01-preview response: body: string: '{"value":[{"properties":{"roleName":"Owner","type":"BuiltInRole","description":"Grants @@ -2100,7 +2100,7 @@ interactions: User-Agent: - AZURECLI/2.51.0 azsdk-python-azure-mgmt-authorization/3.0.0 Python/3.9.5 (Windows-10-10.0.22621-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/blueprint-rg-000005/providers/Microsoft.Authorization/roleDefinitions?$filter=roleName%20eq%20%27Owner%27&api-version=2022-04-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/blueprint-rg-000005/providers/Microsoft.Authorization/roleDefinitions?$filter=roleName%20eq%20%27Owner%27&api-version=2022-05-01-preview response: body: string: '{"value":[{"properties":{"roleName":"Owner","type":"BuiltInRole","description":"Grants @@ -2858,7 +2858,7 @@ interactions: User-Agent: - AZURECLI/2.51.0 azsdk-python-azure-mgmt-resource/23.1.0b2 Python/3.9.5 (Windows-10-10.0.22621-SP0) method: DELETE - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/blueprint-rg-000005?api-version=2022-09-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/blueprint-rg-000005?api-version=2024-11-01 response: body: string: '' diff --git a/src/blueprint/azext_blueprint/tests/latest/recordings/test_blueprint_import.yaml b/src/blueprint/azext_blueprint/tests/latest/recordings/test_blueprint_import.yaml index 7bbd8b8acbd..ddcb5795523 100644 --- a/src/blueprint/azext_blueprint/tests/latest/recordings/test_blueprint_import.yaml +++ b/src/blueprint/azext_blueprint/tests/latest/recordings/test_blueprint_import.yaml @@ -1102,7 +1102,7 @@ interactions: - AZURECLI/2.46.0 azsdk-python-azure-mgmt-authorization/3.0.0 Python/3.10.10 (Linux-5.15.0-1034-azure-x86_64-with-glibc2.31) VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_261_0 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions?$filter=roleName%20eq%20%27Owner%27&api-version=2022-04-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions?$filter=roleName%20eq%20%27Owner%27&api-version=2022-05-01-preview response: body: string: '{"value":[{"properties":{"roleName":"Owner","type":"BuiltInRole","description":"Grants @@ -1150,7 +1150,7 @@ interactions: - AZURECLI/2.46.0 azsdk-python-azure-mgmt-authorization/3.0.0 Python/3.10.10 (Linux-5.15.0-1034-azure-x86_64-with-glibc2.31) VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_261_0 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions?$filter=roleName%20eq%20%27Owner%27&api-version=2022-04-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions?$filter=roleName%20eq%20%27Owner%27&api-version=2022-05-01-preview response: body: string: '{"value":[{"properties":{"roleName":"Owner","type":"BuiltInRole","description":"Grants @@ -1908,7 +1908,7 @@ interactions: - AZURECLI/2.46.0 azsdk-python-azure-mgmt-resource/22.0.0 Python/3.10.10 (Linux-5.15.0-1034-azure-x86_64-with-glibc2.31) VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_261_0 method: DELETE - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/storage-rg?api-version=2022-09-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/storage-rg?api-version=2024-11-01 response: body: string: ''