From 918bc02c03e31a27ae90a200fc03d3c63ca4463f Mon Sep 17 00:00:00 2001 From: Jonathan Innis Date: Fri, 21 May 2021 10:55:49 -0700 Subject: [PATCH 1/2] Fix private build (#40) --- src/k8s-extension/azext_k8s_extension/_validators.py | 2 +- src/k8s-extension/azext_k8s_extension/custom.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/k8s-extension/azext_k8s_extension/_validators.py b/src/k8s-extension/azext_k8s_extension/_validators.py index 9941c4a117b..31078a4ddbb 100644 --- a/src/k8s-extension/azext_k8s_extension/_validators.py +++ b/src/k8s-extension/azext_k8s_extension/_validators.py @@ -4,7 +4,7 @@ # -------------------------------------------------------------------------------------------- from knack.log import get_logger -from azext_k8s_extension._client_factory import _resource_providers_client +from ._client_factory import _resource_providers_client from . import consts diff --git a/src/k8s-extension/azext_k8s_extension/custom.py b/src/k8s-extension/azext_k8s_extension/custom.py index f4f2e1cafdd..64c99f25abd 100644 --- a/src/k8s-extension/azext_k8s_extension/custom.py +++ b/src/k8s-extension/azext_k8s_extension/custom.py @@ -13,10 +13,8 @@ from azure.cli.core.azclierror import ResourceNotFoundError, MutuallyExclusiveArgumentError, \ InvalidArgumentValueError, CommandNotFoundError, RequiredArgumentMissingError from azure.cli.core.commands.client_factory import get_subscription_id -from azext_k8s_extension.vendored_sdks.models import ConfigurationIdentity -from azext_k8s_extension.vendored_sdks.models import ErrorResponseException -from azext_k8s_extension.vendored_sdks.models import Scope -from azext_k8s_extension._validators import validate_cc_registration +from .vendored_sdks.models import ConfigurationIdentity, ErrorResponseException, Scope +from ._validators import validate_cc_registration from .partner_extensions.ContainerInsights import ContainerInsights from .partner_extensions.AzureDefender import AzureDefender From 3435804d9564057563de600df24f9025d299ff1c Mon Sep 17 00:00:00 2001 From: jonathan-innis Date: Fri, 21 May 2021 10:58:55 -0700 Subject: [PATCH 2/2] Update version --- src/k8s-extension/HISTORY_private.rst | 5 +++++ src/k8s-extension/setup_private.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/k8s-extension/HISTORY_private.rst b/src/k8s-extension/HISTORY_private.rst index 3d3fd9873f1..ab866455ee1 100644 --- a/src/k8s-extension/HISTORY_private.rst +++ b/src/k8s-extension/HISTORY_private.rst @@ -3,6 +3,11 @@ Release History =============== +0.4.0-beta.2 +++++++++++++++++++ + +* Fix import bug + 0.4.0-beta.1 ++++++++++++++++++ diff --git a/src/k8s-extension/setup_private.py b/src/k8s-extension/setup_private.py index 688a9ad761a..bcf133aae62 100644 --- a/src/k8s-extension/setup_private.py +++ b/src/k8s-extension/setup_private.py @@ -32,7 +32,7 @@ # TODO: Add any additional SDK dependencies here DEPENDENCIES = [] -VERSION = "0.4.0-beta.1" +VERSION = "0.4.0-beta.2" with open('README.rst', 'r', encoding='utf-8') as f: README = f.read()