diff --git a/azure-pipelines-full-tests.yml b/azure-pipelines-full-tests.yml index d966c3aeb41..937bcbd78ef 100644 --- a/azure-pipelines-full-tests.yml +++ b/azure-pipelines-full-tests.yml @@ -26,6 +26,8 @@ jobs: python.version: '3.8' Python39: python.version: '3.9' + Python310: + python.version: '3.10' steps: - template: .azure-pipelines/templates/automation_test.yml parameters: @@ -46,6 +48,8 @@ jobs: python.version: '3.8' Python39: python.version: '3.9' + Python310: + python.version: '3.10' steps: - template: .azure-pipelines/templates/automation_test.yml parameters: @@ -66,6 +70,8 @@ jobs: python.version: '3.8' Python39: python.version: '3.9' + Python310: + python.version: '3.10' steps: - template: .azure-pipelines/templates/automation_test.yml parameters: @@ -86,6 +92,8 @@ jobs: python.version: '3.8' Python39: python.version: '3.9' + Python310: + python.version: '3.10' steps: - template: .azure-pipelines/templates/automation_test.yml parameters: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1d156875606..1689c5b40c8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -380,6 +380,11 @@ jobs: --rm -v $PYPI_FILES:/mnt/pypi python:3.9 \ /bin/bash -c "ls /mnt/pypi && pip install -f /mnt/pypi -q azure-cli==$CLI_VERSION.* && az self-test && az --version && sleep 5" + echo "== Testing pip install on Python 3.10 ==" + docker run \ + --rm -v $PYPI_FILES:/mnt/pypi python:3.10 \ + /bin/bash -c "ls /mnt/pypi && pip install -f /mnt/pypi -q azure-cli==$CLI_VERSION.* && az self-test && az --version && sleep 5" + displayName: 'Test pip Install' - job: TestCore @@ -395,6 +400,8 @@ jobs: python.version: '3.8' Python39: python.version: '3.9' + Python310: + python.version: '3.10' steps: - template: .azure-pipelines/templates/automation_test.yml parameters: @@ -414,6 +421,8 @@ jobs: python.version: '3.8' Python39: python.version: '3.9' + Python310: + python.version: '3.10' steps: - template: .azure-pipelines/templates/automation_test.yml parameters: @@ -436,6 +445,8 @@ jobs: python.version: '3.8' Python39: python.version: '3.9' + Python310: + python.version: '3.10' steps: - task: UsePythonVersion@0 displayName: 'Use Python $(python.version)' @@ -459,6 +470,8 @@ jobs: python.version: '3.8' Python39: python.version: '3.9' + Python310: + python.version: '3.10' steps: - template: .azure-pipelines/templates/automation_test.yml parameters: @@ -478,6 +491,8 @@ jobs: python.version: '3.8' Python39: python.version: '3.9' + Python310: + python.version: '3.10' steps: - template: .azure-pipelines/templates/automation_test.yml parameters: @@ -497,6 +512,8 @@ jobs: python.version: '3.8' Python39: python.version: '3.9' + Python310: + python.version: '3.10' steps: - template: .azure-pipelines/templates/automation_test.yml parameters: @@ -516,6 +533,8 @@ jobs: python.version: '3.8' Python39: python.version: '3.9' + Python310: + python.version: '3.10' steps: - template: .azure-pipelines/templates/automation_test.yml parameters: diff --git a/src/azure-cli-core/azure/cli/core/_help.py b/src/azure-cli-core/azure/cli/core/_help.py index 1a37bd16314..70a004f3f1c 100644 --- a/src/azure-cli-core/azure/cli/core/_help.py +++ b/src/azure-cli-core/azure/cli/core/_help.py @@ -62,7 +62,7 @@ def _print_header(self, cli_name, help_file): def _print_detailed_help(self, cli_name, help_file): CLIPrintMixin._print_extensions_msg(help_file) super(CLIPrintMixin, self)._print_detailed_help(cli_name, help_file) - self._print_az_find_message(help_file.command, self.cli_ctx.enable_color) + self._print_az_find_message(help_file.command) @staticmethod def _get_choices_defaults_sources_str(p): @@ -88,12 +88,9 @@ def _print_examples(help_file): print('') @staticmethod - def _print_az_find_message(command, enable_color): - from colorama import Style + def _print_az_find_message(command): indent = 0 message = 'To search AI knowledge base for examples, use: az find "az {}"'.format(command) - if enable_color: - message = Style.BRIGHT + message + Style.RESET_ALL _print_indent(message + '\n', indent) @staticmethod diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py index 24dd6ede37a..664be8b97b9 100644 --- a/src/azure-cli-core/setup.py +++ b/src/azure-cli-core/setup.py @@ -39,6 +39,7 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ] @@ -49,7 +50,7 @@ 'cryptography', 'humanfriendly>=4.7,<10.0', 'jmespath', - 'knack~=0.8.2', + 'knack~=0.9.0', 'msal-extensions>=0.3.0,<0.4', 'msal>=1.15.0,<2.0.0', 'paramiko>=2.0.8,<3.0.0', diff --git a/src/azure-cli-telemetry/setup.py b/src/azure-cli-telemetry/setup.py index 38b0b0a1c9f..3330c0784f6 100755 --- a/src/azure-cli-telemetry/setup.py +++ b/src/azure-cli-telemetry/setup.py @@ -20,6 +20,7 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ] diff --git a/src/azure-cli-testsdk/setup.py b/src/azure-cli-testsdk/setup.py index 76da4330cf3..04b7606b06e 100644 --- a/src/azure-cli-testsdk/setup.py +++ b/src/azure-cli-testsdk/setup.py @@ -19,6 +19,7 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ] diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index 9d30cca3e40..77ca75da0b2 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -96,7 +96,7 @@ bcrypt==3.2.0 certifi==2019.6.16 cffi==1.14.4 chardet==3.0.4 -colorama==0.4.1 +colorama==0.4.4 ConfigArgParse==0.14.0 cryptography==3.3.2 fabric==2.4.0 @@ -108,7 +108,7 @@ javaproperties==0.5.1 Jinja2==2.11.3 jmespath==0.9.5 jsondiff==1.3.0 -knack==0.8.2 +knack==0.9.0 MarkupSafe==1.1.1 msal-extensions==0.3.0 msal==1.15.0 @@ -132,7 +132,7 @@ scp==0.13.2 semver==2.13.0 six==1.14.0 sshtunnel==0.1.5 -tabulate==0.8.3 +tabulate==0.8.9 urllib3==1.26.5 vsts==0.1.25 wcwidth==0.1.7 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index c1609e06b65..5b275f61fa1 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -96,7 +96,7 @@ bcrypt==3.2.0 certifi==2019.6.16 cffi==1.14.4 chardet==3.0.4 -colorama==0.4.1 +colorama==0.4.4 ConfigArgParse==0.14.0 cryptography==3.3.2 distro==1.6.0 @@ -109,7 +109,7 @@ javaproperties==0.5.1 Jinja2==2.11.3 jmespath==0.9.5 jsondiff==1.3.0 -knack==0.8.2 +knack==0.9.0 MarkupSafe==1.1.1 msal-extensions==0.3.0 msal==1.15.0 @@ -133,7 +133,7 @@ scp==0.13.2 semver==2.13.0 six==1.14.0 sshtunnel==0.1.5 -tabulate==0.8.3 +tabulate==0.8.9 urllib3==1.26.5 vsts==0.1.25 wcwidth==0.1.7 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index 9ebde010ff4..98ac4b2a417 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -96,7 +96,7 @@ bcrypt==3.2.0 certifi==2019.6.16 cffi==1.14.4 chardet==3.0.4 -colorama==0.4.1 +colorama==0.4.4 cryptography==3.3.2 fabric==2.4.0 humanfriendly==9.1 @@ -107,7 +107,7 @@ javaproperties==0.5.1 Jinja2==2.11.3 jmespath==0.9.5 jsondiff==1.3.0 -knack==0.8.2 +knack==0.9.0 MarkupSafe==1.1.1 msal-extensions==0.3.0 msal==1.15.0 @@ -133,7 +133,7 @@ scp==0.13.2 semver==2.13.0 six==1.14.0 sshtunnel==0.1.5 -tabulate==0.8.3 +tabulate==0.8.9 urllib3==1.26.5 vsts==0.1.25 wcwidth==0.1.7 diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index d95916bda9e..f2f838d34de 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -46,6 +46,7 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ] @@ -136,6 +137,7 @@ 'azure-synapse-managedprivateendpoints~=0.3.0', 'azure-synapse-spark~=0.2.0', 'chardet~=3.0.4', + 'colorama~=0.4.4', 'fabric~=2.4', 'javaproperties~=0.5.1', 'jsondiff~=1.3.0',