From 7329ce65bf2a58f272b59fd47877946e9c4c9ac9 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Fri, 9 Apr 2021 12:06:34 -0400 Subject: [PATCH 1/2] Drop unused dependencies prometheus_client was part of a metrics driver that was dropped. python-gnupg was dropped with the removal of st2debug. zipp and more-itertools were py2-only transitive deps. --- fixed-requirements.txt | 4 ---- requirements.txt | 2 -- st2client/in-requirements.txt | 2 -- st2client/requirements.txt | 2 -- 4 files changed, 10 deletions(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 7fd4b72cd3..1fef7dca81 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -32,7 +32,6 @@ prompt-toolkit==1.0.15 pyinotify==0.9.6; platform_system=="Linux" pymongo==3.11.3 python-editor==1.0.4 -python-gnupg==0.4.5 python-keyczar==0.716 pytz==2021.1 pywinrm==0.3.0 @@ -55,14 +54,11 @@ zake==0.2.2 bcrypt==3.2.0 jinja2==2.11.3 mock==4.0.3 -more-itertools==5.0.0 nose-timer==0.7.5 nose-parallel==0.3.1 psutil==5.8.0 python-dateutil==2.8.1 python-statsd==2.1.0 -prometheus_client==0.1.1 ujson==1.35 orjson==3.5.1 udatetime==0.0.16 -zipp>=0.5,<=1.0.0 diff --git a/requirements.txt b/requirements.txt index aa346668e6..91adccedf4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,7 +30,6 @@ kombu==4.6.6 lockfile==0.12.2 mock==4.0.3 mongoengine==0.23.0 -more-itertools==5.0.0 networkx==1.11 nose nose-parallel==0.3.1 @@ -68,4 +67,3 @@ unittest2 webob==1.8.7 webtest zake==0.2.2 -zipp>=0.5,<=1.0.0 diff --git a/st2client/in-requirements.txt b/st2client/in-requirements.txt index 13d0f3cf7f..6d1341e742 100644 --- a/st2client/in-requirements.txt +++ b/st2client/in-requirements.txt @@ -13,7 +13,5 @@ python-editor prompt-toolkit cryptography orjson -more-itertools==5.0.0 -zipp>=0.5,<=1.0.0 # needed by requests chardet diff --git a/st2client/requirements.txt b/st2client/requirements.txt index ab436c7878..5103232989 100644 --- a/st2client/requirements.txt +++ b/st2client/requirements.txt @@ -10,7 +10,6 @@ chardet<3.1.0 cryptography==3.4.7 jsonpath-rw==1.4.0 jsonschema==2.6.0 -more-itertools==5.0.0 orjson==3.5.1 prettytable prompt-toolkit==1.0.15 @@ -21,4 +20,3 @@ pyyaml==5.4 requests[security]==2.25.1 six==1.13.0 sseclient-py==1.7 -zipp>=0.5,<=1.0.0 From 44260df3ee11a25ba9f59fc7ee17ae1d245de588 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Fri, 9 Apr 2021 21:03:09 -0400 Subject: [PATCH 2/2] add changelog --- CHANGELOG.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9280573518..ba3a877491 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -238,6 +238,10 @@ Improvements Contributed by @ashwini-orchestral +* Drop unused python dependencies: prometheus_client, python-gnupg, more-itertools, zipp. #5228 + + Contributed by @cognifloyd. + Fixed ~~~~~