From 3523c04036bb8ac12e69b7d23a259484f57df7c8 Mon Sep 17 00:00:00 2001 From: Travis Prescott Date: Tue, 9 Jul 2019 09:13:00 -0700 Subject: [PATCH] Update to Knack 0.6.3. (#9893) * Update to Knack 0.6.3. * Fix batch linter violations. --- src/azure-cli/azure/cli/command_modules/batch/_help.py | 7 ++++++- src/azure-cli/requirements.py2.Darwin.txt | 2 +- src/azure-cli/requirements.py2.Linux.txt | 2 +- src/azure-cli/requirements.py2.windows.txt | 2 +- src/azure-cli/requirements.py3.Darwin.txt | 2 +- src/azure-cli/requirements.py3.Linux.txt | 2 +- src/azure-cli/requirements.py3.windows.txt | 2 +- src/azure-cli/setup.py | 2 +- 8 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/batch/_help.py b/src/azure-cli/azure/cli/command_modules/batch/_help.py index 4db61edecfe..40f1353378d 100644 --- a/src/azure-cli/azure/cli/command_modules/batch/_help.py +++ b/src/azure-cli/azure/cli/command_modules/batch/_help.py @@ -47,8 +47,13 @@ short-summary: Log in to a Batch account through Azure Active Directory or Shared Key authentication. """ -helps['batch pool supported-images list'] = """ +helps['batch pool supported-images'] = """ type: group + short-summary: Query information on VM images supported by Azure Batch service. +""" + +helps['batch pool supported-images list'] = """ + type: command short-summary: Lists all Virtual Machine Images supported by the Azure Batch service. """ diff --git a/src/azure-cli/requirements.py2.Darwin.txt b/src/azure-cli/requirements.py2.Darwin.txt index a4d4d1af691..68d3436af3a 100644 --- a/src/azure-cli/requirements.py2.Darwin.txt +++ b/src/azure-cli/requirements.py2.Darwin.txt @@ -99,7 +99,7 @@ ipaddress==1.0.22 isodate==0.6.0 Jinja2==2.10.1 jmespath==0.9.4 -knack==0.6.2 +knack==0.6.3 MarkupSafe==1.1.1 mock==2.0.0 monotonic==1.5 diff --git a/src/azure-cli/requirements.py2.Linux.txt b/src/azure-cli/requirements.py2.Linux.txt index a4d4d1af691..68d3436af3a 100644 --- a/src/azure-cli/requirements.py2.Linux.txt +++ b/src/azure-cli/requirements.py2.Linux.txt @@ -99,7 +99,7 @@ ipaddress==1.0.22 isodate==0.6.0 Jinja2==2.10.1 jmespath==0.9.4 -knack==0.6.2 +knack==0.6.3 MarkupSafe==1.1.1 mock==2.0.0 monotonic==1.5 diff --git a/src/azure-cli/requirements.py2.windows.txt b/src/azure-cli/requirements.py2.windows.txt index a4383727589..4324d6bde5a 100644 --- a/src/azure-cli/requirements.py2.windows.txt +++ b/src/azure-cli/requirements.py2.windows.txt @@ -96,7 +96,7 @@ ipaddress==1.0.22 isodate==0.6.0 Jinja2==2.10.1 jmespath==0.9.4 -knack==0.6.2 +knack==0.6.3 MarkupSafe==1.1.1 mock==2.0.0 monotonic==1.5 diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index eb3502e8427..827c5617c3d 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -93,7 +93,7 @@ invoke==1.2.0 isodate==0.6.0 Jinja2==2.10.1 jmespath==0.9.4 -knack==0.6.2 +knack==0.6.3 MarkupSafe==1.1.1 mock==2.0.0 msrest==0.6.7 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index eb3502e8427..827c5617c3d 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -93,7 +93,7 @@ invoke==1.2.0 isodate==0.6.0 Jinja2==2.10.1 jmespath==0.9.4 -knack==0.6.2 +knack==0.6.3 MarkupSafe==1.1.1 mock==2.0.0 msrest==0.6.7 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index 42fef1f7b57..a980ba85217 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -91,7 +91,7 @@ invoke==1.2.0 isodate==0.6.0 Jinja2==2.10.1 jmespath==0.9.4 -knack==0.6.2 +knack==0.6.3 MarkupSafe==1.1.1 mock==2.0.0 msrest==0.6.7 diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 57ad9f96582..d2bfd15fdf5 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -127,7 +127,7 @@ 'colorama~=0.4.1', 'cryptography>=2.3.1,<3.0.0', 'fabric~=2.4', - 'knack~=0.6.2', + 'knack~=0.6,>=0.6.3', 'mock~=2.0', 'paramiko>=2.0.8,<3.0.0', 'prompt_toolkit~=1.0,>=1.0.15',