From c550bcd3b370109015bbe66e6a52db4ddcbc33b3 Mon Sep 17 00:00:00 2001
From: Graham Hayes <gr@ham.ie>
Date: Mon, 19 Jul 2021 18:35:17 +0100
Subject: [PATCH 1/2] {Packaging} Add SOCKS Proxy Support to az cli
Add the extra `[socks]` require for requests to add socks libraries to the
dependancies.
Signed-off-by: Graham Hayes <graham.hayes@microsoft.com>
---
src/azure-cli/requirements.py3.Darwin.txt | 2 +-
src/azure-cli/requirements.py3.Linux.txt | 2 +-
src/azure-cli/requirements.py3.windows.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt
index 3659840caeb..edc4aa5548e 100644
--- a/src/azure-cli/requirements.py3.Darwin.txt
+++ b/src/azure-cli/requirements.py3.Darwin.txt
@@ -126,7 +126,7 @@ pyOpenSSL==19.0.0
python-dateutil==2.8.0
pytz==2019.1
requests-oauthlib==1.2.0
-requests==2.25.1
+requests[socks]==2.25.1
scp==0.13.2
semver==2.13.0
six==1.14.0
diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt
index e338bc67b4d..b7889e8b7be 100644
--- a/src/azure-cli/requirements.py3.Linux.txt
+++ b/src/azure-cli/requirements.py3.Linux.txt
@@ -126,7 +126,7 @@ pyOpenSSL==19.0.0
python-dateutil==2.8.0
pytz==2019.1
requests-oauthlib==1.2.0
-requests==2.25.1
+requests[socks]==2.25.1
scp==0.13.2
semver==2.13.0
six==1.14.0
diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt
index d65b4d736a4..a6c0da4eb5c 100644
--- a/src/azure-cli/requirements.py3.windows.txt
+++ b/src/azure-cli/requirements.py3.windows.txt
@@ -127,7 +127,7 @@ python-dateutil==2.8.0
pytz==2019.1
pywin32==300
requests-oauthlib==1.2.0
-requests==2.25.1
+requests[socks]==2.25.1
scp==0.13.2
semver==2.13.0
six==1.14.0
From f9e0e4ec558c1ffbfda5b4bb3a84e8456e48bda3 Mon Sep 17 00:00:00 2001
From: jiasli <4003950+jiasli@users.noreply.github.com>
Date: Tue, 20 Jul 2021 18:21:02 +0800
Subject: [PATCH 2/2] Add requests[socks]~=2.25.1 to setup.py
---
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 f40846500ea..8b26d32098d 100644
--- a/src/azure-cli-core/setup.py
+++ b/src/azure-cli-core/setup.py
@@ -57,7 +57,7 @@
'pkginfo>=1.5.0.1',
'PyJWT>=2.1.0',
'pyopenssl>=17.1.0', # https://github.com/pyca/pyopenssl/pull/612
- 'requests~=2.25.1',
+ 'requests[socks]~=2.25.1',
'six~=1.12',
'urllib3[secure]>=1.26.5',
]