Merge branch 'master' into changelog-3.6

cognifloyd · web-flow · commit 03e3d4fce503 · 2021-10-26T12:28:00.000-05:00
diff --git 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<3
 zstandard==0.15.2
 python-editor==1.0.4
 python-keyczar==0.716
diff --git 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<3
 pyrabbit
 python-dateutil==2.8.1
 python-editor==1.0.4
diff --git 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
@@ -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<3
 python-dateutil==2.8.1
 python-json-logger
 pyyaml==5.4.1
diff --git 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
@@ -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<3
 simplejson
 six==1.13.0
diff --git 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
@@ -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<3
 six==1.13.0
