From 35f822fbb389d505d0bc6aea63c7dd5d73442236 Mon Sep 17 00:00:00 2001 From: zhoxing-ms Date: Mon, 14 Feb 2022 09:35:57 +0800 Subject: [PATCH 1/4] Hotfix for 2.33.1 --- src/azure-cli-core/HISTORY.rst | 4 ++++ src/azure-cli-core/azure/cli/core/__init__.py | 2 +- src/azure-cli-core/setup.py | 2 +- src/azure-cli/HISTORY.rst | 7 +++++++ src/azure-cli/azure/cli/__main__.py | 2 +- src/azure-cli/requirements.py3.Darwin.txt | 4 ++-- src/azure-cli/requirements.py3.Linux.txt | 4 ++-- src/azure-cli/requirements.py3.windows.txt | 4 ++-- src/azure-cli/setup.py | 2 +- 9 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/azure-cli-core/HISTORY.rst b/src/azure-cli-core/HISTORY.rst index 74e1f509d21..f0384c2a895 100644 --- a/src/azure-cli-core/HISTORY.rst +++ b/src/azure-cli-core/HISTORY.rst @@ -3,6 +3,10 @@ Release History =============== +2.33.1 +++++++ +* No changes + 2.33.0 ++++++ * Drop `--query-examples` global argument (#20962) diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py index 78acb78ff2e..5476a4b33aa 100644 --- a/src/azure-cli-core/azure/cli/core/__init__.py +++ b/src/azure-cli-core/azure/cli/core/__init__.py @@ -4,7 +4,7 @@ # -------------------------------------------------------------------------------------------- # pylint: disable=line-too-long -__version__ = "2.33.0" +__version__ = "2.33.1" import os import sys diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py index 7aa553e2d84..f3b7e87ee0b 100644 --- a/src/azure-cli-core/setup.py +++ b/src/azure-cli-core/setup.py @@ -8,7 +8,7 @@ from codecs import open from setuptools import setup, find_packages -VERSION = "2.33.0" +VERSION = "2.33.1" # If we have source, validate that our version numbers match # This should prevent uploading releases with mismatched versions. diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst index 73f6b527d71..b9c8f4b4ea2 100644 --- a/src/azure-cli/HISTORY.rst +++ b/src/azure-cli/HISTORY.rst @@ -3,6 +3,13 @@ Release History =============== +2.33.1 +++++++ + +**Compute** + +Hotfix: Fix #21224: Fix the issue that VMCustomization is not enabled (#21241) + 2.33.0 ++++++ diff --git a/src/azure-cli/azure/cli/__main__.py b/src/azure-cli/azure/cli/__main__.py index b26c3c7c8ca..d2465326af7 100644 --- a/src/azure-cli/azure/cli/__main__.py +++ b/src/azure-cli/azure/cli/__main__.py @@ -17,7 +17,7 @@ from knack.log import get_logger __author__ = "Microsoft Corporation " -__version__ = "2.33.0" +__version__ = "2.33.1" # A workaround for https://bugs.python.org/issue32502 (https://github.com/Azure/azure-cli/issues/5184) diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index 6055977277b..27f5fdcb607 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -4,9 +4,9 @@ argcomplete==1.11.1 asn1crypto==0.24.0 azure-appconfiguration==1.1.1 azure-batch==11.0.0 -azure-cli-core==2.33.0 +azure-cli-core==2.33.1 azure-cli-telemetry==1.0.6 -azure-cli==2.33.0 +azure-cli==2.33.1 azure-common==1.1.22 azure-core==1.21.1 azure-cosmos==3.2.0 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index b9225fb64d0..8f395e44f02 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -4,9 +4,9 @@ argcomplete==1.11.1 asn1crypto==0.24.0 azure-appconfiguration==1.1.1 azure-batch==11.0.0 -azure-cli-core==2.33.0 +azure-cli-core==2.33.1 azure-cli-telemetry==1.0.6 -azure-cli==2.33.0 +azure-cli==2.33.1 azure-common==1.1.22 azure-core==1.21.1 azure-cosmos==3.2.0 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index c0bd2da9186..4a5e9fa5d3f 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -4,9 +4,9 @@ argcomplete==1.11.1 asn1crypto==0.24.0 azure-appconfiguration==1.1.1 azure-batch==11.0.0 -azure-cli-core==2.33.0 +azure-cli-core==2.33.1 azure-cli-telemetry==1.0.6 -azure-cli==2.33.0 +azure-cli==2.33.1 azure-common==1.1.22 azure-core==1.21.1 azure-cosmos==3.2.0 diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 37f9031b6ce..36ea4f4a146 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -17,7 +17,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "2.33.0" +VERSION = "2.33.1" # If we have source, validate that our version numbers match # This should prevent uploading releases with mismatched versions. try: From 190d50c8388f771138140814c79749e1d7b16016 Mon Sep 17 00:00:00 2001 From: Xing Zhou Date: Mon, 14 Feb 2022 10:20:34 +0800 Subject: [PATCH 2/4] Update HISTORY.rst --- src/azure-cli/HISTORY.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst index b9c8f4b4ea2..663fa5073c4 100644 --- a/src/azure-cli/HISTORY.rst +++ b/src/azure-cli/HISTORY.rst @@ -8,7 +8,11 @@ Release History **Compute** -Hotfix: Fix #21224: Fix the issue that VMCustomization is not enabled (#21241) +* Hotfix: Fix #21224: Fix the issue that VMCustomization is not enabled (#21241) + +**Packaging** + +* BREAKING CHANGE: Drop jmespath-terminal from docker image (#21277) 2.33.0 ++++++ From 2a340891470d86fa1491cc02b476dd5c22d7ef0c Mon Sep 17 00:00:00 2001 From: Xing Zhou Date: Mon, 14 Feb 2022 10:36:34 +0800 Subject: [PATCH 3/4] Update src/azure-cli/HISTORY.rst Co-authored-by: Yu Chen <16348853+jsntcy@users.noreply.github.com> --- src/azure-cli/HISTORY.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst index 663fa5073c4..d226de862a4 100644 --- a/src/azure-cli/HISTORY.rst +++ b/src/azure-cli/HISTORY.rst @@ -12,7 +12,7 @@ Release History **Packaging** -* BREAKING CHANGE: Drop jmespath-terminal from docker image (#21277) +* [BREAKING CHANGE]: Drop jmespath-terminal from docker image (#21277) 2.33.0 ++++++ From 4fabfdbea46e6a00ca2f6ae64c77db7fc549740d Mon Sep 17 00:00:00 2001 From: Xing Zhou Date: Mon, 14 Feb 2022 10:38:26 +0800 Subject: [PATCH 4/4] Update src/azure-cli/HISTORY.rst --- src/azure-cli/HISTORY.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst index d226de862a4..c01a65f0b94 100644 --- a/src/azure-cli/HISTORY.rst +++ b/src/azure-cli/HISTORY.rst @@ -12,7 +12,7 @@ Release History **Packaging** -* [BREAKING CHANGE]: Drop jmespath-terminal from docker image (#21277) +* [BREAKING CHANGE] Drop jmespath-terminal from docker image (#21277) 2.33.0 ++++++