From 95ee9a9f0f5304710551b6546a0dffdb525b0fb3 Mon Sep 17 00:00:00 2001 From: Adam Kingsley Date: Wed, 1 Dec 2021 09:45:40 +0100 Subject: [PATCH 1/3] #5460 - Include pysocks in st2client --- st2client/in-requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/st2client/in-requirements.txt b/st2client/in-requirements.txt index dc6b73d669..28005fe297 100644 --- a/st2client/in-requirements.txt +++ b/st2client/in-requirements.txt @@ -18,3 +18,5 @@ cryptography orjson # needed by requests chardet +# required for SOCKS proxy support (HTTP_PROXY, HTTPS_PROXY, NO_PROXY) +pysocks From efaa562ed682a94c6d82af86a9d2c733cfd3fdd3 Mon Sep 17 00:00:00 2001 From: Adam Kingsley Date: Wed, 1 Dec 2021 10:08:30 +0100 Subject: [PATCH 2/3] Add missing requirements generated by make --- requirements.txt | 1 + st2client/requirements.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index aa495cf67c..1dc9c70b64 100644 --- a/requirements.txt +++ b/requirements.txt @@ -50,6 +50,7 @@ pyinotify==0.9.6; platform_system=="Linux" pymongo==3.11.3 pyparsing<3 pyrabbit +pysocks python-dateutil==2.8.1 python-editor==1.0.4 python-json-logger diff --git a/st2client/requirements.txt b/st2client/requirements.txt index 03797d7c7a..22fa8e9ab7 100644 --- a/st2client/requirements.txt +++ b/st2client/requirements.txt @@ -15,6 +15,7 @@ jsonschema==2.6.0 orjson==3.5.2 prettytable==2.1.0 prompt-toolkit==1.0.15 +pysocks python-dateutil==2.8.1 python-editor==1.0.4 pytz==2021.1 From 3f7203d730f9cefa11293d37459e19c3992acc6a Mon Sep 17 00:00:00 2001 From: Adam Kingsley Date: Thu, 6 Jan 2022 09:39:56 +0100 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1e7f64709f..49be921a59 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -34,6 +34,10 @@ Added Contributed by @khushboobhatia01 +* Added pysocks python package for SOCKS proxy support. #5460 + + Contributed by @kingsleyadam + Fixed ~~~~~