1
0
Dominique Leuenberger 2022-09-20 17:23:28 +00:00 committed by Git OBS Bridge
commit 18759a65a1
6 changed files with 30 additions and 22 deletions

View File

@ -1,8 +1,7 @@
Index: azure-cli-core-2.39.0/azure/cli/core/util.py 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.39.0.orig/azure/cli/core/util.py +++ azure-cli-core-2.40.0/azure/cli/core/util.py 2022-09-16 11:13:11.938223294 +0200
+++ azure-cli-core-2.39.0/azure/cli/core/util.py @@ -485,19 +485,7 @@
@@ -485,20 +485,7 @@ def show_updates_available(new_line_befo
def show_updates(updates_available_components, only_show_when_updates_available=False): 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.') - 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 - elif updates_available_components: # pylint: disable=too-many-nested-blocks
- if in_cloud_console(): - 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: - else:
- warning_msg = "You have %i updates available." - warning_msg = "You have %i update(s) available."
- if CLI_PACKAGE_NAME in updates_available_components: - if CLI_PACKAGE_NAME in updates_available_components:
- warning_msg = "{} Consider updating your CLI installation with 'az upgrade'".format(warning_msg) - warning_msg = "{} Consider updating your CLI installation with 'az upgrade'".format(warning_msg)
- logger.warning(warning_msg, len(updates_available_components)) - logger.warning(warning_msg, len(updates_available_components))
- elif not only_show_when_updates_available: - elif not only_show_when_updates_available:
- print('Your CLI is up-to-date.') - print('Your CLI is up-to-date.')
-
+ return + return
def get_json_object(json_string): def get_json_object(json_string):
""" Loads a JSON string as an object and converts all keys to snake case """

View File

@ -1,14 +1,12 @@
diff -Nru azure-cli-core-2.40.0.orig/setup.py azure-cli-core-2.40.0/setup.py
Index: azure-cli-core-2.39.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
--- azure-cli-core-2.39.0.orig/setup.py @@ -43,7 +43,7 @@
+++ azure-cli-core-2.39.0/setup.py
@@ -43,7 +43,7 @@ CLASSIFIERS = [
] ]
DEPENDENCIES = [ DEPENDENCIES = [
- 'argcomplete~=1.8', - 'argcomplete~=1.8',
+ 'argcomplete>=1.8.0', + 'argcomplete>=1.8.0',
'azure-cli-telemetry==1.0.7.*', 'azure-cli-telemetry==1.0.8.*',
'azure-mgmt-core>=1.2.0,<2', 'azure-mgmt-core>=1.2.0,<2',
'cryptography', 'cryptography',

View File

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

View File

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

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Sep 16 09:40:28 UTC 2022 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- 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 <dmueller@suse.com> Mon Aug 8 07:55:56 UTC 2022 - Dirk Müller <dmueller@suse.com>

View File

@ -17,7 +17,7 @@
Name: azure-cli-core Name: azure-cli-core
Version: 2.39.0 Version: 2.40.0
Release: 0 Release: 0
Summary: Microsoft Azure CLI Core Module Summary: Microsoft Azure CLI Core Module
License: MIT License: MIT
@ -33,7 +33,7 @@ BuildRequires: python-rpm-macros
BuildRequires: python3-azure-nspkg >= 3.0.0 BuildRequires: python3-azure-nspkg >= 3.0.0
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
Requires: azure-cli-nspkg 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-PyJWT >= 2.1.0
Requires: python3-argcomplete < 3.0 Requires: python3-argcomplete < 3.0
Requires: python3-argcomplete >= 2.0 Requires: python3-argcomplete >= 2.0
@ -45,7 +45,7 @@ Requires: python3-humanfriendly < 11.0
Requires: python3-humanfriendly >= 10.0 Requires: python3-humanfriendly >= 10.0
Requires: python3-jmespath Requires: python3-jmespath
Requires: python3-knack < 1.0.0 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 < 2.0.0
Requires: python3-msal >= 1.18.0b1 Requires: python3-msal >= 1.18.0b1
Requires: python3-msal-extensions < 2.0.0 Requires: python3-msal-extensions < 2.0.0