From 1fe489161b2527e44c9c8caf67d0d035ae5d9d49b9bb59053c9c744607d85637 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Fri, 8 Jan 2021 12:07:53 +0000 Subject: [PATCH 1/3] Accepting request 861579 from home:glaubitz:branches:Cloud:Tools - 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 OBS-URL: https://build.opensuse.org/request/show/861579 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/azure-cli-core?expand=0&rev=53 --- acc_disable-update-check.patch | 20 +++++++++++--------- azure-cli-core-2.15.0.tar.gz | 3 --- azure-cli-core-2.16.0.tar.gz | 3 +++ azure-cli-core.changes | 12 ++++++++++++ azure-cli-core.spec | 12 ++++++++---- 5 files changed, 34 insertions(+), 16 deletions(-) delete mode 100644 azure-cli-core-2.15.0.tar.gz create mode 100644 azure-cli-core-2.16.0.tar.gz diff --git a/acc_disable-update-check.patch b/acc_disable-update-check.patch index 2578399..bfec766 100644 --- a/acc_disable-update-check.patch +++ b/acc_disable-update-check.patch @@ -1,7 +1,7 @@ -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.16.0.orig/azure/cli/core/util.py azure-cli-core-2.16.0/azure/cli/core/util.py +--- azure-cli-core-2.16.0.orig/azure/cli/core/util.py 2020-12-04 13:30:56.000000000 +0100 ++++ azure-cli-core-2.16.0/azure/cli/core/util.py 2020-12-16 16:30:56.721229524 +0100 +@@ -419,39 +419,7 @@ def show_updates_available(new_line_before=False, new_line_after=False): @@ -17,15 +17,16 @@ diff -Nru azure-cli-core-2.12.1.orig/azure/cli/core/util.py azure-cli-core-2.12. - if updates_available_components: - if new_line_before: - logger.warning("") -- show_updates(updates_available_components) +- show_updates(updates_available_components, only_show_when_updates_available=True) - 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 +35,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 """ diff --git a/azure-cli-core-2.15.0.tar.gz b/azure-cli-core-2.15.0.tar.gz deleted file mode 100644 index 65bcc27..0000000 --- a/azure-cli-core-2.15.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc667262cfa61c5a2a20e0644e915cb77be3d8e2329a33912e07b3fb2051d4d8 -size 150833 diff --git a/azure-cli-core-2.16.0.tar.gz b/azure-cli-core-2.16.0.tar.gz new file mode 100644 index 0000000..a339f52 --- /dev/null +++ b/azure-cli-core-2.16.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b54bf0bdab27ad8646c89ee2c2f0529fbbe00ea755eaa94e77e4aedd7fdf3e3 +size 170548 diff --git a/azure-cli-core.changes b/azure-cli-core.changes index fb15ed0..ee8a4ba 100644 --- a/azure-cli-core.changes +++ b/azure-cli-core.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Dec 16 15:31:24 UTC 2020 - John Paul Adrian Glaubitz + +- 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 diff --git a/azure-cli-core.spec b/azure-cli-core.spec index 0b2b5b8..9489590 100644 --- a/azure-cli-core.spec +++ b/azure-cli-core.spec @@ -17,7 +17,7 @@ Name: azure-cli-core -Version: 2.15.0 +Version: 2.16.0 Release: 0 Summary: Microsoft Azure CLI Core Module License: MIT @@ -43,8 +43,12 @@ 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 @@ -56,7 +60,7 @@ 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 From 7081f05bb82f7593349fa78333f6fff01cc304532dcfc9169cea88417620f432 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Fri, 8 Jan 2021 15:23:07 +0000 Subject: [PATCH 2/3] Accepting request 861728 from home:glaubitz:branches:Cloud:Tools - New upstream release + Version 2.17.1 + For detailed information about changes see the HISTORY.rst file provided with this package OBS-URL: https://build.opensuse.org/request/show/861728 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/azure-cli-core?expand=0&rev=54 --- azure-cli-core-2.16.0.tar.gz | 3 --- azure-cli-core-2.17.1.tar.gz | 3 +++ azure-cli-core.changes | 8 ++++++++ azure-cli-core.spec | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 azure-cli-core-2.16.0.tar.gz create mode 100644 azure-cli-core-2.17.1.tar.gz diff --git a/azure-cli-core-2.16.0.tar.gz b/azure-cli-core-2.16.0.tar.gz deleted file mode 100644 index a339f52..0000000 --- a/azure-cli-core-2.16.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b54bf0bdab27ad8646c89ee2c2f0529fbbe00ea755eaa94e77e4aedd7fdf3e3 -size 170548 diff --git a/azure-cli-core-2.17.1.tar.gz b/azure-cli-core-2.17.1.tar.gz new file mode 100644 index 0000000..c9ccf26 --- /dev/null +++ b/azure-cli-core-2.17.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27cdbff8e535c48788e2bf37113f7ad213182f5c0b32ffa13d5c013d478b8651 +size 172598 diff --git a/azure-cli-core.changes b/azure-cli-core.changes index ee8a4ba..f4d88f5 100644 --- a/azure-cli-core.changes +++ b/azure-cli-core.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 8 14:34:26 UTC 2021 - John Paul Adrian Glaubitz + +- 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 diff --git a/azure-cli-core.spec b/azure-cli-core.spec index 9489590..f458b0e 100644 --- a/azure-cli-core.spec +++ b/azure-cli-core.spec @@ -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.16.0 +Version: 2.17.1 Release: 0 Summary: Microsoft Azure CLI Core Module License: MIT From def82da2abc8506be3a50668edccdece1685d9513ae1cb5422f2f09a3451d4f1 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Thu, 21 Jan 2021 17:00:25 +0000 Subject: [PATCH 3/3] Accepting request 865462 from home:glaubitz:branches: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 OBS-URL: https://build.opensuse.org/request/show/865462 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/azure-cli-core?expand=0&rev=55 --- acc_disable-update-check.patch | 29 +++++------------------------ azure-cli-core-2.17.1.tar.gz | 3 --- azure-cli-core-2.18.0.tar.gz | 3 +++ azure-cli-core.changes | 12 ++++++++++++ azure-cli-core.spec | 6 +++--- 5 files changed, 23 insertions(+), 30 deletions(-) delete mode 100644 azure-cli-core-2.17.1.tar.gz create mode 100644 azure-cli-core-2.18.0.tar.gz diff --git a/acc_disable-update-check.patch b/acc_disable-update-check.patch index bfec766..d24e7f0 100644 --- a/acc_disable-update-check.patch +++ b/acc_disable-update-check.patch @@ -1,29 +1,10 @@ -diff -Nru azure-cli-core-2.16.0.orig/azure/cli/core/util.py azure-cli-core-2.16.0/azure/cli/core/util.py ---- azure-cli-core-2.16.0.orig/azure/cli/core/util.py 2020-12-04 13:30:56.000000000 +0100 -+++ azure-cli-core-2.16.0/azure/cli/core/util.py 2020-12-16 16:30:56.721229524 +0100 -@@ -419,39 +419,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, only_show_when_updates_available=True) -- if new_line_after: -- logger.warning("") -- VERSIONS[_VERSION_CHECK_TIME] = str(datetime.datetime.now()) -- -- --def show_updates(updates_available_components, only_show_when_updates_available=False): + def show_updates(updates_available_components, only_show_when_updates_available=False): - if updates_available_components is None: - if not only_show_when_updates_available: - logger.warning('Unable to check if your CLI is up-to-date. Check your internet connection.') diff --git a/azure-cli-core-2.17.1.tar.gz b/azure-cli-core-2.17.1.tar.gz deleted file mode 100644 index c9ccf26..0000000 --- a/azure-cli-core-2.17.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27cdbff8e535c48788e2bf37113f7ad213182f5c0b32ffa13d5c013d478b8651 -size 172598 diff --git a/azure-cli-core-2.18.0.tar.gz b/azure-cli-core-2.18.0.tar.gz new file mode 100644 index 0000000..850ba51 --- /dev/null +++ b/azure-cli-core-2.18.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ab39c81672df2fc2efe9cafebe6bd8b3d26acbd8f0cef8444eb0621b202858c +size 173069 diff --git a/azure-cli-core.changes b/azure-cli-core.changes index f4d88f5..97df095 100644 --- a/azure-cli-core.changes +++ b/azure-cli-core.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jan 21 15:11:04 UTC 2021 - John Paul Adrian Glaubitz + +- 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 diff --git a/azure-cli-core.spec b/azure-cli-core.spec index f458b0e..4983c55 100644 --- a/azure-cli-core.spec +++ b/azure-cli-core.spec @@ -17,7 +17,7 @@ Name: azure-cli-core -Version: 2.17.1 +Version: 2.18.0 Release: 0 Summary: Microsoft Azure CLI Core Module License: MIT @@ -51,11 +51,11 @@ 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