From cc1c1333f0781ae0f19a314494f0f67d658be5a6d56871efa5e5417caea2fdb4 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 16 Sep 2022 12:54:53 +0000 Subject: [PATCH] Accepting request 1004082 from home:glaubitz:branches:Cloud:Tools - New upstream release + Version 2.40.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 + acc_update-argcomplete.patch - Update Requires from setup.py OBS-URL: https://build.opensuse.org/request/show/1004082 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/azure-cli-core?expand=0&rev=91 --- acc_disable-update-check.patch | 16 +++++++--------- acc_update-argcomplete.patch | 12 +++++------- azure-cli-core-2.39.0.tar.gz | 3 --- azure-cli-core-2.40.0.tar.gz | 3 +++ azure-cli-core.changes | 12 ++++++++++++ azure-cli-core.spec | 6 +++--- 6 files changed, 30 insertions(+), 22 deletions(-) delete mode 100644 azure-cli-core-2.39.0.tar.gz create mode 100644 azure-cli-core-2.40.0.tar.gz diff --git a/acc_disable-update-check.patch b/acc_disable-update-check.patch index dfa87dd..7dd3bb8 100644 --- a/acc_disable-update-check.patch +++ b/acc_disable-update-check.patch @@ -1,8 +1,7 @@ -Index: azure-cli-core-2.39.0/azure/cli/core/util.py -=================================================================== ---- azure-cli-core-2.39.0.orig/azure/cli/core/util.py -+++ azure-cli-core-2.39.0/azure/cli/core/util.py -@@ -485,20 +485,7 @@ def show_updates_available(new_line_befo +diff -Nru azure-cli-core-2.40.0.orig/azure/cli/core/util.py azure-cli-core-2.40.0/azure/cli/core/util.py +--- azure-cli-core-2.40.0.orig/azure/cli/core/util.py 2022-09-02 07:40:04.000000000 +0200 ++++ azure-cli-core-2.40.0/azure/cli/core/util.py 2022-09-16 11:13:11.938223294 +0200 +@@ -485,19 +485,7 @@ def show_updates(updates_available_components, only_show_when_updates_available=False): @@ -11,16 +10,15 @@ Index: azure-cli-core-2.39.0/azure/cli/core/util.py - 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.' +- warning_msg = 'You have %i update(s) available. They will be updated with the next build of Cloud Shell.' - else: -- warning_msg = "You have %i updates available." +- warning_msg = "You have %i update(s) available." - 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)) - 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/acc_update-argcomplete.patch b/acc_update-argcomplete.patch index 89e138e..529bc56 100644 --- a/acc_update-argcomplete.patch +++ b/acc_update-argcomplete.patch @@ -1,14 +1,12 @@ - -Index: azure-cli-core-2.39.0/setup.py -=================================================================== ---- azure-cli-core-2.39.0.orig/setup.py -+++ azure-cli-core-2.39.0/setup.py -@@ -43,7 +43,7 @@ CLASSIFIERS = [ +diff -Nru azure-cli-core-2.40.0.orig/setup.py azure-cli-core-2.40.0/setup.py +--- azure-cli-core-2.40.0.orig/setup.py 2022-09-02 07:40:04.000000000 +0200 ++++ azure-cli-core-2.40.0/setup.py 2022-09-16 11:35:17.346870084 +0200 +@@ -43,7 +43,7 @@ ] DEPENDENCIES = [ - 'argcomplete~=1.8', + 'argcomplete>=1.8.0', - 'azure-cli-telemetry==1.0.7.*', + 'azure-cli-telemetry==1.0.8.*', 'azure-mgmt-core>=1.2.0,<2', 'cryptography', diff --git a/azure-cli-core-2.39.0.tar.gz b/azure-cli-core-2.39.0.tar.gz deleted file mode 100644 index 66e6d7d..0000000 --- a/azure-cli-core-2.39.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:796f1a83218670a7e38619f2230e433e10580e55ea82b05445cdeec40c9376bc -size 198706 diff --git a/azure-cli-core-2.40.0.tar.gz b/azure-cli-core-2.40.0.tar.gz new file mode 100644 index 0000000..ee31ed9 --- /dev/null +++ b/azure-cli-core-2.40.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35ae525aa097a676c11f0469cadba1f9692d20098b1a227ec7a996bf18986bd7 +size 200871 diff --git a/azure-cli-core.changes b/azure-cli-core.changes index ab3d607..6a2e2d2 100644 --- a/azure-cli-core.changes +++ b/azure-cli-core.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Sep 16 09:40:28 UTC 2022 - John Paul Adrian Glaubitz + +- New upstream release + + Version 2.40.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 + + acc_update-argcomplete.patch +- Update Requires from setup.py + ------------------------------------------------------------------- Mon Aug 8 07:55:56 UTC 2022 - Dirk Müller diff --git a/azure-cli-core.spec b/azure-cli-core.spec index f919500..ec5c271 100644 --- a/azure-cli-core.spec +++ b/azure-cli-core.spec @@ -17,7 +17,7 @@ Name: azure-cli-core -Version: 2.39.0 +Version: 2.40.0 Release: 0 Summary: Microsoft Azure CLI Core Module License: MIT @@ -33,7 +33,7 @@ BuildRequires: python-rpm-macros BuildRequires: python3-azure-nspkg >= 3.0.0 BuildRequires: python3-setuptools Requires: azure-cli-nspkg -Requires: azure-cli-telemetry >= 1.0.7 +Requires: azure-cli-telemetry >= 1.0.8 Requires: python3-PyJWT >= 2.1.0 Requires: python3-argcomplete < 3.0 Requires: python3-argcomplete >= 2.0 @@ -45,7 +45,7 @@ Requires: python3-humanfriendly < 11.0 Requires: python3-humanfriendly >= 10.0 Requires: python3-jmespath Requires: python3-knack < 1.0.0 -Requires: python3-knack >= 0.9.0 +Requires: python3-knack >= 0.10.0 Requires: python3-msal < 2.0.0 Requires: python3-msal >= 1.18.0b1 Requires: python3-msal-extensions < 2.0.0