From bd84a608f9d3ffbbf37d1a3267615d14953f92f1 Mon Sep 17 00:00:00 2001 From: Khushboo Date: Mon, 25 Oct 2021 16:58:37 +0530 Subject: [PATCH 1/5] Fix CI package errors --- fixed-requirements.txt | 1 + requirements.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index dc1b8ede6a..78b101706c 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -39,6 +39,7 @@ prance==0.9.0 prompt-toolkit==1.0.15 pyinotify==0.9.6; platform_system=="Linux" pymongo==3.11.3 +pyparsing<=2.4.7 zstandard==0.15.2 python-editor==1.0.4 python-keyczar==0.716 diff --git a/requirements.txt b/requirements.txt index 84811ef6e6..84a4fe4a2c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -48,6 +48,7 @@ prompt-toolkit==1.0.15 psutil==5.8.0 pyinotify==0.9.6; platform_system=="Linux" pymongo==3.11.3 +pyparsing<=2.4.7 pyrabbit python-dateutil==2.8.1 python-editor==1.0.4 From 1fd051c6ec663bfde91cda7f7331d618df316dc3 Mon Sep 17 00:00:00 2001 From: Khushboo Date: Mon, 25 Oct 2021 17:08:36 +0530 Subject: [PATCH 2/5] Remove edits from requirements.txt --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 84a4fe4a2c..84811ef6e6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -48,7 +48,6 @@ prompt-toolkit==1.0.15 psutil==5.8.0 pyinotify==0.9.6; platform_system=="Linux" pymongo==3.11.3 -pyparsing<=2.4.7 pyrabbit python-dateutil==2.8.1 python-editor==1.0.4 From 64823874b61b6e196d4653eed2f32cc5a3c38407 Mon Sep 17 00:00:00 2001 From: Khushboo Date: Mon, 25 Oct 2021 18:04:29 +0530 Subject: [PATCH 3/5] update requirements --- requirements.txt | 1 + st2actions/in-requirements.txt | 1 + st2actions/requirements.txt | 1 + st2api/in-requirements.txt | 1 + st2api/requirements.txt | 1 + st2stream/in-requirements.txt | 1 + st2stream/requirements.txt | 1 + 7 files changed, 7 insertions(+) diff --git a/requirements.txt b/requirements.txt index 84811ef6e6..84a4fe4a2c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -48,6 +48,7 @@ prompt-toolkit==1.0.15 psutil==5.8.0 pyinotify==0.9.6; platform_system=="Linux" pymongo==3.11.3 +pyparsing<=2.4.7 pyrabbit python-dateutil==2.8.1 python-editor==1.0.4 diff --git a/st2actions/in-requirements.txt b/st2actions/in-requirements.txt index 28db9ad84e..0f390636e1 100644 --- a/st2actions/in-requirements.txt +++ b/st2actions/in-requirements.txt @@ -6,6 +6,7 @@ jinja2 kombu oslo.config oslo.utils +pyparsing requests six pyyaml diff --git a/st2actions/requirements.txt b/st2actions/requirements.txt index c2cbd0b00f..0c06444c1b 100644 --- a/st2actions/requirements.txt +++ b/st2actions/requirements.txt @@ -16,6 +16,7 @@ lockfile==0.12.2 oslo.config>=1.12.1,<1.13 oslo.utils<5.0,>=4.0.0 pyinotify==0.9.6; platform_system=="Linux" +pyparsing<=2.4.7 python-dateutil==2.8.1 python-json-logger pyyaml==5.4.1 diff --git a/st2api/in-requirements.txt b/st2api/in-requirements.txt index e1049a75c9..d3506c27f1 100644 --- a/st2api/in-requirements.txt +++ b/st2api/in-requirements.txt @@ -6,6 +6,7 @@ mongoengine pymongo oslo.config oslo.utils +pyparsing pymongo six gunicorn diff --git a/st2api/requirements.txt b/st2api/requirements.txt index c9f385ab4d..424b6c34f8 100644 --- a/st2api/requirements.txt +++ b/st2api/requirements.txt @@ -13,5 +13,6 @@ mongoengine==0.23.0 oslo.config>=1.12.1,<1.13 oslo.utils<5.0,>=4.0.0 pymongo==3.11.3 +pyparsing<=2.4.7 simplejson six==1.13.0 diff --git a/st2stream/in-requirements.txt b/st2stream/in-requirements.txt index 76799216c1..b6024af935 100644 --- a/st2stream/in-requirements.txt +++ b/st2stream/in-requirements.txt @@ -6,6 +6,7 @@ mongoengine pymongo oslo.config oslo.utils +pyparsing pymongo six gunicorn diff --git a/st2stream/requirements.txt b/st2stream/requirements.txt index a7bb19887a..749658a021 100644 --- a/st2stream/requirements.txt +++ b/st2stream/requirements.txt @@ -13,4 +13,5 @@ mongoengine==0.23.0 oslo.config>=1.12.1,<1.13 oslo.utils<5.0,>=4.0.0 pymongo==3.11.3 +pyparsing<=2.4.7 six==1.13.0 From 6cd582e65f3ef8d7b1ad7c7b3df47e632de9f67b Mon Sep 17 00:00:00 2001 From: Khushboo Date: Tue, 26 Oct 2021 06:00:21 +0530 Subject: [PATCH 4/5] update requirements --- fixed-requirements.txt | 2 +- requirements.txt | 2 +- st2actions/requirements.txt | 2 +- st2api/requirements.txt | 2 +- st2stream/requirements.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 78b101706c..5f85842837 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -39,7 +39,7 @@ prance==0.9.0 prompt-toolkit==1.0.15 pyinotify==0.9.6; platform_system=="Linux" pymongo==3.11.3 -pyparsing<=2.4.7 +pyparsing<3 zstandard==0.15.2 python-editor==1.0.4 python-keyczar==0.716 diff --git a/requirements.txt b/requirements.txt index 84a4fe4a2c..aa495cf67c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -48,7 +48,7 @@ prompt-toolkit==1.0.15 psutil==5.8.0 pyinotify==0.9.6; platform_system=="Linux" pymongo==3.11.3 -pyparsing<=2.4.7 +pyparsing<3 pyrabbit python-dateutil==2.8.1 python-editor==1.0.4 diff --git a/st2actions/requirements.txt b/st2actions/requirements.txt index 0c06444c1b..e8afb6f520 100644 --- a/st2actions/requirements.txt +++ b/st2actions/requirements.txt @@ -16,7 +16,7 @@ lockfile==0.12.2 oslo.config>=1.12.1,<1.13 oslo.utils<5.0,>=4.0.0 pyinotify==0.9.6; platform_system=="Linux" -pyparsing<=2.4.7 +pyparsing<3 python-dateutil==2.8.1 python-json-logger pyyaml==5.4.1 diff --git a/st2api/requirements.txt b/st2api/requirements.txt index 424b6c34f8..f503ef97bc 100644 --- a/st2api/requirements.txt +++ b/st2api/requirements.txt @@ -13,6 +13,6 @@ mongoengine==0.23.0 oslo.config>=1.12.1,<1.13 oslo.utils<5.0,>=4.0.0 pymongo==3.11.3 -pyparsing<=2.4.7 +pyparsing<3 simplejson six==1.13.0 diff --git a/st2stream/requirements.txt b/st2stream/requirements.txt index 749658a021..faa39eafd8 100644 --- a/st2stream/requirements.txt +++ b/st2stream/requirements.txt @@ -13,5 +13,5 @@ mongoengine==0.23.0 oslo.config>=1.12.1,<1.13 oslo.utils<5.0,>=4.0.0 pymongo==3.11.3 -pyparsing<=2.4.7 +pyparsing<3 six==1.13.0 From 66ab16bb0f6f567c75940b058b7c4420be780e4b Mon Sep 17 00:00:00 2001 From: Khushboo Date: Tue, 26 Oct 2021 06:09:04 +0530 Subject: [PATCH 5/5] Retrigger