diff --git a/src/acrcssc/HISTORY.rst b/src/acrcssc/HISTORY.rst index 2dd1e3fe4e4..08b21d1c1b0 100644 --- a/src/acrcssc/HISTORY.rst +++ b/src/acrcssc/HISTORY.rst @@ -2,6 +2,10 @@ Release History =============== +1.0.0b3 ++++++++ +* Remove msrestazure dependency + 1.0.0b2 ++++++ * Bug fix: Updated to allow for az login when the account doesn't have any active subscriptions diff --git a/src/acrcssc/azext_acrcssc/helper/_workflow_status.py b/src/acrcssc/azext_acrcssc/helper/_workflow_status.py index 64c27914035..86fbfe91e11 100644 --- a/src/acrcssc/azext_acrcssc/helper/_workflow_status.py +++ b/src/acrcssc/azext_acrcssc/helper/_workflow_status.py @@ -17,13 +17,13 @@ ) from azure.cli.core.commands import LongRunningOperation from azure.cli.core.commands.progress import IndeterminateProgressBar +from azure.core.exceptions import HttpResponseError from azure.cli.core.profiles import ResourceType, get_sdk from azure.cli.core.azclierror import AzCLIError, ResourceNotFoundError from azure.core.polling import PollingMethod from azure.mgmt.core.tools import parse_resource_id from knack.log import get_logger from enum import Enum -from msrestazure.azure_exceptions import CloudError logger = get_logger(__name__) @@ -239,7 +239,7 @@ def process_taskrun(taskrun): taskrun.task_log_result = tasklog except ResourceNotFoundError as e: logger.debug("Failed to get logs for taskrun: %s with exception: %s", taskrun.run_id, e) - except CloudError as e: + except HttpResponseError as e: logger.debug("An unexpected exception has occurred for taskrun: %s with exception: %s", taskrun.run_id, e) @@ -439,7 +439,7 @@ def generate_logs(cmd, registry_name=registry_name, run_id=run_id) log_file_sas = response.log_link - except (AttributeError, CloudError) as e: + except (AttributeError, HttpResponseError) as e: logger.debug("%s Exception: %s", error_msg, e) raise AzCLIError(error_msg) except ResourceNotFoundError as e: @@ -476,7 +476,7 @@ def get_run_status_local(client, resource_group_name, registry_name, run_id): try: response = client.get(resource_group_name, registry_name, run_id) return response.status - except (AttributeError, CloudError): + except (AttributeError, HttpResponseError): return None @staticmethod diff --git a/src/acrcssc/setup.py b/src/acrcssc/setup.py index 8b30c9894ea..5175d918901 100644 --- a/src/acrcssc/setup.py +++ b/src/acrcssc/setup.py @@ -13,7 +13,7 @@ from distutils import log as logger logger.warn("Wheel is not available, disabling bdist_wheel hook") -VERSION = '1.0.0b2' +VERSION = '1.0.0b3' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers