From b696ac0796ff2866e59f26181b78759c72564a9c Mon Sep 17 00:00:00 2001 From: jiasli <4003950+jiasli@users.noreply.github.com> Date: Sat, 16 Oct 2021 11:58:23 +0800 Subject: [PATCH 1/2] Add msal-extensions dependency --- src/azure-cli-core/setup.py | 3 ++- src/azure-cli/requirements.py3.Darwin.txt | 3 ++- src/azure-cli/requirements.py3.Linux.txt | 1 + src/azure-cli/requirements.py3.windows.txt | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py index 3305ea6bb76..6c1ebba282a 100644 --- a/src/azure-cli-core/setup.py +++ b/src/azure-cli-core/setup.py @@ -50,13 +50,14 @@ 'humanfriendly>=4.7,<10.0', 'jmespath', 'knack~=0.8.2', + 'msal-extensions>=0.3.0', 'msal>=1.15.0,<2.0.0', 'paramiko>=2.0.8,<3.0.0', 'pkginfo>=1.5.0.1', 'PyJWT>=2.1.0', 'pyopenssl>=17.1.0', # https://github.com/pyca/pyopenssl/pull/612 'requests[socks]~=2.25.1', - 'urllib3[secure]>=1.26.5', + 'urllib3[secure]>=1.26.5' ] # dependencies for specific OSes diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index 8a649193076..8a7599e9980 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -84,8 +84,8 @@ azure-mgmt-sqlvirtualmachine==1.0.0b1 azure-mgmt-storage==19.0.0 azure-mgmt-synapse==2.0.0 azure-mgmt-trafficmanager==0.51.0 -azure-multiapi-storage==0.7.0 azure-mgmt-web==4.0.0 +azure-multiapi-storage==0.7.0 azure-nspkg==3.0.2 azure-storage-common==1.4.2 azure-synapse-accesscontrol==0.5.0 @@ -110,6 +110,7 @@ jmespath==0.9.5 jsondiff==1.2.0 knack==0.8.2 MarkupSafe==1.1.1 +msal-extensions==0.3.0 msal==1.15.0 msrest==0.6.21 msrestazure==0.6.3 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index 2e8f3fdbe75..42c6bf06120 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -111,6 +111,7 @@ jmespath==0.9.5 jsondiff==1.2.0 knack==0.8.2 MarkupSafe==1.1.1 +msal-extensions==0.3.0 msal==1.15.0 msrest==0.6.21 msrestazure==0.6.3 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index 5aa66b4812d..e4025057f2b 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -109,6 +109,7 @@ jmespath==0.9.5 jsondiff==1.2.0 knack==0.8.2 MarkupSafe==1.1.1 +msal-extensions==0.3.0 msal==1.15.0 msrest==0.6.21 msrestazure==0.6.3 From 188298b2acedda6ad379ce365f52154387f575ff Mon Sep 17 00:00:00 2001 From: jiasli <4003950+jiasli@users.noreply.github.com> Date: Sat, 16 Oct 2021 12:59:40 +0800 Subject: [PATCH 2/2] upper bound --- src/azure-cli-core/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py index 6c1ebba282a..fd4a957e9c9 100644 --- a/src/azure-cli-core/setup.py +++ b/src/azure-cli-core/setup.py @@ -50,7 +50,7 @@ 'humanfriendly>=4.7,<10.0', 'jmespath', 'knack~=0.8.2', - 'msal-extensions>=0.3.0', + 'msal-extensions>=0.3.0,<0.4', 'msal>=1.15.0,<2.0.0', 'paramiko>=2.0.8,<3.0.0', 'pkginfo>=1.5.0.1',