1
0

Accepting request 865490 from Cloud:Tools

- New upstream release
  + Version 2.18.0
  + For detailed information about changes see the
    HISTORY.rst file provided with this package
- Rework patch to disable automatic check for updates to
  fix a crash when calling "az --version" (bsc#1180930)
  + acc_disable-update-check.patch
- Update Requires from setup.py (forwarded request 865462 from glaubitz)

OBS-URL: https://build.opensuse.org/request/show/865490
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/azure-cli-core?expand=0&rev=22
This commit is contained in:
Dominique Leuenberger 2021-01-22 20:51:52 +00:00 committed by Git OBS Bridge
commit 2f40edac77
5 changed files with 56 additions and 37 deletions

View File

@ -1,31 +1,13 @@
diff -Nru azure-cli-core-2.12.1.orig/azure/cli/core/util.py azure-cli-core-2.12.1/azure/cli/core/util.py
--- azure-cli-core-2.12.1.orig/azure/cli/core/util.py 2020-09-28 10:37:30.000000000 +0200
+++ azure-cli-core-2.12.1/azure/cli/core/util.py 2020-09-30 14:51:49.700308773 +0200
@@ -331,37 +331,7 @@
diff -Nru azure-cli-core-2.18.0.orig/azure/cli/core/util.py azure-cli-core-2.18.0/azure/cli/core/util.py
--- azure-cli-core-2.18.0.orig/azure/cli/core/util.py 2021-01-15 10:50:35.000000000 +0100
+++ azure-cli-core-2.18.0/azure/cli/core/util.py 2021-01-21 10:32:01.708270048 +0100
@@ -439,20 +439,7 @@
def show_updates_available(new_line_before=False, new_line_after=False):
- from azure.cli.core._session import VERSIONS
- import datetime
-
- if VERSIONS[_VERSION_CHECK_TIME]:
- version_check_time = datetime.datetime.strptime(VERSIONS[_VERSION_CHECK_TIME], '%Y-%m-%d %H:%M:%S.%f')
- if datetime.datetime.now() < version_check_time + datetime.timedelta(days=7):
- return
-
- _, updates_available_components = get_az_version_string(use_cache=True)
- if updates_available_components:
- if new_line_before:
- logger.warning("")
- show_updates(updates_available_components)
- if new_line_after:
- logger.warning("")
- VERSIONS[_VERSION_CHECK_TIME] = str(datetime.datetime.now())
-
-
-def show_updates(updates_available_components):
def show_updates(updates_available_components, only_show_when_updates_available=False):
- if updates_available_components is None:
- logger.warning('Unable to check if your CLI is up-to-date. Check your internet connection.')
- if not only_show_when_updates_available:
- logger.warning('Unable to check if your CLI is up-to-date. Check your internet connection.')
- elif updates_available_components: # pylint: disable=too-many-nested-blocks
- if in_cloud_console():
- warning_msg = 'You have %i updates available. They will be updated with the next build of Cloud Shell.'
@ -34,9 +16,10 @@ diff -Nru azure-cli-core-2.12.1.orig/azure/cli/core/util.py azure-cli-core-2.12.
- if CLI_PACKAGE_NAME in updates_available_components:
- warning_msg = "{} Consider updating your CLI installation with 'az upgrade'".format(warning_msg)
- logger.warning(warning_msg, len(updates_available_components))
- else:
- elif not only_show_when_updates_available:
- print('Your CLI is up-to-date.')
-
+ return
def get_json_object(json_string):
""" Loads a JSON string as an object and converts all keys to snake case """

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fc667262cfa61c5a2a20e0644e915cb77be3d8e2329a33912e07b3fb2051d4d8
size 150833

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ab39c81672df2fc2efe9cafebe6bd8b3d26acbd8f0cef8444eb0621b202858c
size 173069

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Thu Jan 21 15:11:04 UTC 2021 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- New upstream release
+ Version 2.18.0
+ For detailed information about changes see the
HISTORY.rst file provided with this package
- Rework patch to disable automatic check for updates to
fix a crash when calling "az --version" (bsc#1180930)
+ acc_disable-update-check.patch
- Update Requires from setup.py
-------------------------------------------------------------------
Fri Jan 8 14:34:26 UTC 2021 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- New upstream release
+ Version 2.17.1
+ For detailed information about changes see the
HISTORY.rst file provided with this package
-------------------------------------------------------------------
Wed Dec 16 15:31:24 UTC 2020 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- New upstream release
+ Version 2.16.0
+ For detailed information about changes see the
HISTORY.rst file provided with this package
- Refresh patches for new version
+ acc_disable-update-check.patch
- Update Requires from setup.py
+ Temporarily use a vendored copy of azure-mgmt-resource
-------------------------------------------------------------------
Wed Nov 18 11:55:02 UTC 2020 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package azure-cli-core
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: azure-cli-core
Version: 2.15.0
Version: 2.18.0
Release: 0
Summary: Microsoft Azure CLI Core Module
License: MIT
@ -43,20 +43,24 @@ Requires: python3-argcomplete < 2.0
Requires: python3-argcomplete >= 1.8
Requires: python3-azure-mgmt-core < 2.0.0
Requires: python3-azure-mgmt-core >= 1.2.1
Requires: python3-azure-mgmt-resource < 16.0.0
Requires: python3-azure-mgmt-resource >= 15.0.0
# Temporarily using an embedded copy of azure-mgmt-resource
# see: https://github.com/Azure/azure-cli/issues/15496
# Requires: python3-azure-mgmt-resource < 16.0.0
# Requires: python3-azure-mgmt-resource >= 15.0.0
Requires: python3-azure-common < 2.0
Requires: python3-azure-common >= 1.1
Requires: python3-azure-nspkg >= 3.0.0
Requires: python3-colorama >= 0.4.1
Requires: python3-humanfriendly < 9.0
Requires: python3-humanfriendly < 10.0
Requires: python3-humanfriendly >= 4.7
Requires: python3-jmespath
Requires: python3-knack < 1.0.0
Requires: python3-knack >= 0.7.2
Requires: python3-knack >= 0.8.0rc2
Requires: python3-msal < 2.0.0
Requires: python3-msal >= 1.0.0
Requires: python3-msal-extensions < 1.0.0
Requires: python3-msal-extensions >= 0.1.3
Requires: python3-msrest >= 0.4.4
Requires: python3-msrest >= 0.5.0
Requires: python3-msrestazure >= 0.6.3
Requires: python3-paramiko < 3.0.0
Requires: python3-paramiko >= 2.0.8