From 54c5452c6e725d0af9e1def7d3bb67d21661bb1e Mon Sep 17 00:00:00 2001 From: W Chan Date: Sat, 18 Jan 2020 20:54:34 +0000 Subject: [PATCH 1/2] Fix to st2client install check The make .st2client-install-check command is failing because latest more-itertools no longer supports python 2.7. To workaround, pin more-itertools to an older version. --- fixed-requirements.txt | 1 + requirements.txt | 1 + st2client/in-requirements.txt | 1 + st2client/requirements.txt | 1 + 4 files changed, 4 insertions(+) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 3ac7f05d29..fd36040e37 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -57,3 +57,4 @@ ujson==1.35 python-dateutil==2.8.0 bcrypt==3.1.7 jinja2==2.10.3 +more-itertools==5.0.0 diff --git a/requirements.txt b/requirements.txt index d884a6f1ce..c8962d0635 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,6 +28,7 @@ kombu==4.6.6 lockfile==0.12.2 mock==2.0.0 mongoengine==0.18.2 +more-itertools==5.0.0 networkx==1.11 nose nose-parallel==0.3.1 diff --git a/st2client/in-requirements.txt b/st2client/in-requirements.txt index 625425e5e0..db74e91d9d 100644 --- a/st2client/in-requirements.txt +++ b/st2client/in-requirements.txt @@ -12,3 +12,4 @@ sseclient-py python-editor prompt-toolkit cryptography +more-itertools==5.0.0 diff --git a/st2client/requirements.txt b/st2client/requirements.txt index 70853f52b2..885706d2d7 100644 --- a/st2client/requirements.txt +++ b/st2client/requirements.txt @@ -9,6 +9,7 @@ argcomplete cryptography==2.8 jsonpath-rw==1.4.0 jsonschema==2.6.0 +more-itertools==5.0.0 prettytable prompt-toolkit==1.0.15 python-dateutil==2.8.0 From 4aa2a8a88b422399a10a186feb32e0b7f8ca6ae0 Mon Sep 17 00:00:00 2001 From: W Chan Date: Mon, 20 Jan 2020 21:00:24 +0000 Subject: [PATCH 2/2] Pin zipp to work around zipp 2.0.0 packaging error When running st2client install check, the requirement zipp>=0.5 will install zipp 2.0.0 which will registered as 0.0.0 that fails the st2client install check. This is likely an upstream error. The zipp requirement is pinned to >=0.5,<=1.0.0 to workaround the issue. --- fixed-requirements.txt | 1 + requirements.txt | 1 + st2client/in-requirements.txt | 1 + st2client/requirements.txt | 1 + 4 files changed, 4 insertions(+) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index fd36040e37..8e4a3a5c49 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -58,3 +58,4 @@ python-dateutil==2.8.0 bcrypt==3.1.7 jinja2==2.10.3 more-itertools==5.0.0 +zipp>=0.5,<=1.0.0 diff --git a/requirements.txt b/requirements.txt index c8962d0635..f239a34483 100644 --- a/requirements.txt +++ b/requirements.txt @@ -65,3 +65,4 @@ unittest2 webob==1.8.5 webtest zake==0.2.2 +zipp<=1.0.0,>=0.5 diff --git a/st2client/in-requirements.txt b/st2client/in-requirements.txt index db74e91d9d..ca4f1dabbb 100644 --- a/st2client/in-requirements.txt +++ b/st2client/in-requirements.txt @@ -13,3 +13,4 @@ python-editor prompt-toolkit cryptography more-itertools==5.0.0 +zipp>=0.5,<=1.0.0 diff --git a/st2client/requirements.txt b/st2client/requirements.txt index 885706d2d7..b712f1718a 100644 --- a/st2client/requirements.txt +++ b/st2client/requirements.txt @@ -19,3 +19,4 @@ pyyaml==5.1.2 requests[security]==2.22.0 six==1.13.0 sseclient-py==1.7 +zipp<=1.0.0,>=0.5