From fa67e22560c0c0f1de3be5411da2046c6e8a3f22 Mon Sep 17 00:00:00 2001 From: Martin Strobel Date: Tue, 12 Mar 2019 12:35:25 -0700 Subject: [PATCH 1/3] Add tolerance to key management library packages. Fixes #6973 This is made possible by @lmazuel's awesome assistance, as well as PRs: Azure/azure-sdk-for-python#4541 Azure/azure-sdk-for-python#4542 Azure/azure-sdk-for-python#3543 --- src/command_modules/azure-cli-backup/setup.py | 4 ++-- src/command_modules/azure-cli-dla/setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/command_modules/azure-cli-backup/setup.py b/src/command_modules/azure-cli-backup/setup.py index 35335fad6c3..53bc312561a 100644 --- a/src/command_modules/azure-cli-backup/setup.py +++ b/src/command_modules/azure-cli-backup/setup.py @@ -31,8 +31,8 @@ ] DEPENDENCIES = [ - 'azure-mgmt-recoveryservices==0.1.0', - 'azure-mgmt-recoveryservicesbackup==0.1.1', + 'azure-mgmt-recoveryservices~=0.1.0', + 'azure-mgmt-recoveryservicesbackup~=0.1.1', 'azure-cli-core' ] diff --git a/src/command_modules/azure-cli-dla/setup.py b/src/command_modules/azure-cli-dla/setup.py index 75e6c1a694e..8fc56fcb288 100644 --- a/src/command_modules/azure-cli-dla/setup.py +++ b/src/command_modules/azure-cli-dla/setup.py @@ -35,7 +35,7 @@ DEPENDENCIES = [ 'azure-mgmt-datalake-store==0.5.0', - 'azure-mgmt-datalake-analytics==0.2.0', + 'azure-mgmt-datalake-analytics~=0.2.0', 'azure-cli-core', ] From abd12659a8d567cf1741be1938fc53b5439ac442 Mon Sep 17 00:00:00 2001 From: Martin Strobel Date: Tue, 12 Mar 2019 12:55:31 -0700 Subject: [PATCH 2/3] Updating version numbers and release notes --- src/command_modules/azure-cli-backup/HISTORY.rst | 3 +++ src/command_modules/azure-cli-backup/setup.py | 2 +- src/command_modules/azure-cli-dla/HISTORY.rst | 4 ++++ src/command_modules/azure-cli-dla/setup.py | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/command_modules/azure-cli-backup/HISTORY.rst b/src/command_modules/azure-cli-backup/HISTORY.rst index 41ef21641f5..c8727266dbb 100644 --- a/src/command_modules/azure-cli-backup/HISTORY.rst +++ b/src/command_modules/azure-cli-backup/HISTORY.rst @@ -2,6 +2,9 @@ Release History =============== +1.2.2 ++++++ +* Minor fixes. 1.2.1 +++++ diff --git a/src/command_modules/azure-cli-backup/setup.py b/src/command_modules/azure-cli-backup/setup.py index 53bc312561a..03caf6c987a 100644 --- a/src/command_modules/azure-cli-backup/setup.py +++ b/src/command_modules/azure-cli-backup/setup.py @@ -13,7 +13,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "1.2.1" +VERSION = "1.2.2" # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers diff --git a/src/command_modules/azure-cli-dla/HISTORY.rst b/src/command_modules/azure-cli-dla/HISTORY.rst index 5ce521e2a47..83c6557730e 100644 --- a/src/command_modules/azure-cli-dla/HISTORY.rst +++ b/src/command_modules/azure-cli-dla/HISTORY.rst @@ -2,6 +2,10 @@ Release History =============== +0.2.5 ++++++ +* Minor fixes. + 0.2.4 +++++ * Minor fixes. diff --git a/src/command_modules/azure-cli-dla/setup.py b/src/command_modules/azure-cli-dla/setup.py index 8fc56fcb288..9b9800185ff 100644 --- a/src/command_modules/azure-cli-dla/setup.py +++ b/src/command_modules/azure-cli-dla/setup.py @@ -16,7 +16,7 @@ cmdclass = {} -VERSION = "0.2.4" +VERSION = "0.2.5" # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers CLASSIFIERS = [ From ac4e8a131a8e3711fd6fc3b6ec3509f7e91da39f Mon Sep 17 00:00:00 2001 From: Martin Strobel Date: Tue, 12 Mar 2019 13:48:56 -0700 Subject: [PATCH 3/3] Responding to review feedback. ~= is okay, but the fix is actually to bump the version. It's better to be explicit. --- src/command_modules/azure-cli-backup/setup.py | 4 ++-- src/command_modules/azure-cli-dla/setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/command_modules/azure-cli-backup/setup.py b/src/command_modules/azure-cli-backup/setup.py index 03caf6c987a..cce75585f49 100644 --- a/src/command_modules/azure-cli-backup/setup.py +++ b/src/command_modules/azure-cli-backup/setup.py @@ -31,8 +31,8 @@ ] DEPENDENCIES = [ - 'azure-mgmt-recoveryservices~=0.1.0', - 'azure-mgmt-recoveryservicesbackup~=0.1.1', + 'azure-mgmt-recoveryservices~=0.1.1', + 'azure-mgmt-recoveryservicesbackup~=0.1.2', 'azure-cli-core' ] diff --git a/src/command_modules/azure-cli-dla/setup.py b/src/command_modules/azure-cli-dla/setup.py index 9b9800185ff..0eecf8e6232 100644 --- a/src/command_modules/azure-cli-dla/setup.py +++ b/src/command_modules/azure-cli-dla/setup.py @@ -35,7 +35,7 @@ DEPENDENCIES = [ 'azure-mgmt-datalake-store==0.5.0', - 'azure-mgmt-datalake-analytics~=0.2.0', + 'azure-mgmt-datalake-analytics~=0.2.1', 'azure-cli-core', ]