Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/azure-cli-core/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
Release History
===============

2.17.10
+++++++

* Migrate the authentication library from ADAL to MSAL.

2.17.0
++++++
* Minor fixes
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli-core/azure/cli/core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from __future__ import print_function

__version__ = "2.17.0"
__version__ = "2.17.10"

import os
import sys
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli-core/azure/cli/core/_help.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
/_/ \_\/___|\__,_|_| \___|


Welcome to the cool new Azure CLI!
Welcome to Azure CLI v3 beta with MSAL support!

Use `az --version` to display the current version.
Here are the base commands:
Expand Down
5 changes: 2 additions & 3 deletions src/azure-cli-core/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from codecs import open
from setuptools import setup, find_packages

VERSION = "2.17.0"
VERSION = "2.17.10"

# If we have source, validate that our version numbers match
# This should prevent uploading releases with mismatched versions.
Expand Down Expand Up @@ -43,7 +43,6 @@
]

DEPENDENCIES = [
'adal~=1.2.3',
'argcomplete~=1.8',
'azure-cli-telemetry==1.0.6.*',
'colorama~=0.4.1',
Expand All @@ -54,7 +53,7 @@
'msrest>=0.4.4',
'msrestazure>=0.6.3',
'paramiko>=2.0.8,<3.0.0',
'PyJWT',
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix:

msal 1.5.1 requires PyJWT[crypto]<2,>=1.0.0, but you'll have pyjwt 2.0.0 which is incompatible.

'PyJWT==1.7.1',
'pyopenssl>=17.1.0', # https://github.com/pyca/pyopenssl/pull/612
'requests~=2.22',
'six~=1.12',
Expand Down
5 changes: 5 additions & 0 deletions src/azure-cli/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
Release History
===============

2.17.10
+++++++

* Migrate the authentication library from ADAL to MSAL.

2.17.0
++++++

Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/azure/cli/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from knack.log import get_logger

__author__ = "Microsoft Corporation <[email protected]>"
__version__ = "2.17.0"
__version__ = "2.17.10"


# A workaround for https://bugs.python.org/issue32502 (https://github.com/Azure/azure-cli/issues/5184)
Expand Down
4 changes: 2 additions & 2 deletions src/azure-cli/requirements.py3.Darwin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ argcomplete==1.11.1
asn1crypto==0.24.0
azure-appconfiguration==1.1.1
azure-batch==10.0.0
azure-cli==2.17.0
azure-cli-core==2.17.0
azure-cli==2.17.10
azure-cli-core==2.17.10
azure-cli-telemetry==1.0.6
azure-common==1.1.22
azure-cosmos==3.2.0
Expand Down
4 changes: 2 additions & 2 deletions src/azure-cli/requirements.py3.Linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ argcomplete==1.11.1
asn1crypto==0.24.0
azure-appconfiguration==1.1.1
azure-batch==10.0.0
azure-cli==2.17.0
azure-cli-core==2.17.0
azure-cli==2.17.10
azure-cli-core==2.17.10
azure-cli-telemetry==1.0.6
azure-common==1.1.22
azure-cosmos==3.2.0
Expand Down
4 changes: 2 additions & 2 deletions src/azure-cli/requirements.py3.windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ argcomplete==1.11.1
asn1crypto==0.24.0
azure-appconfiguration==1.1.1
azure-batch==10.0.0
azure-cli==2.17.0
azure-cli-core==2.17.0
azure-cli==2.17.10
azure-cli-core==2.17.10
azure-cli-telemetry==1.0.6
azure-common==1.1.22
azure-cosmos==3.2.0
Expand Down
3 changes: 1 addition & 2 deletions src/azure-cli/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
logger.warn("Wheel is not available, disabling bdist_wheel hook")
cmdclass = {}

VERSION = "2.17.0"
VERSION = "2.17.10"
# If we have source, validate that our version numbers match
# This should prevent uploading releases with mismatched versions.
try:
Expand Down Expand Up @@ -131,7 +131,6 @@
'azure-synapse-accesscontrol~=0.2.0',
'azure-synapse-artifacts~=0.3.0',
'azure-synapse-spark~=0.2.0',
'cryptography>=2.3.1,<3.0.0',
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix:

pyopenssl 20.0.1 requires cryptography>=3.2, but you'll have cryptography 2.9.2 which is incompatible.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is already an ongoing PR #15687 to bump cryptography to 3.2.

'fabric~=2.4',
'jsmin~=2.2.2',
'pytz==2019.1',
Expand Down